libweave: Remove few small base/ dependencies
In particular Contains() and SimpleTestClock and StringPiece from
crypto.
Also updated some includes.
BUG=brillo:1256
TEST=`FEATURES=test emerge-gizmo libweave buffet`
Change-Id: I4efd2e8154c7c432532d7e18afec9acf10f156f1
Reviewed-on: https://chromium-review.googlesource.com/294340
Reviewed-by: Alex Vakulenko <avakulenko@chromium.org>
Commit-Queue: Vitaly Buka <vitalybuka@chromium.org>
Tested-by: Vitaly Buka <vitalybuka@chromium.org>
diff --git a/libweave/external/crypto/p224_unittest.cc b/libweave/external/crypto/p224_unittest.cc
index 5d149da..c0d3b2f 100644
--- a/libweave/external/crypto/p224_unittest.cc
+++ b/libweave/external/crypto/p224_unittest.cc
@@ -771,9 +771,9 @@
TEST(P224, ExternalToInternalAndBack) {
Point point;
- EXPECT_TRUE(point.SetFromString(base::StringPiece(
- reinterpret_cast<const char *>(kBasePointExternal),
- sizeof(kBasePointExternal))));
+ EXPECT_TRUE(point.SetFromString(
+ std::string(reinterpret_cast<const char*>(kBasePointExternal),
+ sizeof(kBasePointExternal))));
const std::string external = point.ToString();
@@ -797,10 +797,10 @@
TEST(P224, Addition) {
Point a, b, minus_b, sum, a_again;
- ASSERT_TRUE(a.SetFromString(base::StringPiece(
- reinterpret_cast<const char *>(kNISTTestVectors[10].affine), 56)));
- ASSERT_TRUE(b.SetFromString(base::StringPiece(
- reinterpret_cast<const char *>(kNISTTestVectors[11].affine), 56)));
+ ASSERT_TRUE(a.SetFromString(std::string(
+ reinterpret_cast<const char*>(kNISTTestVectors[10].affine), 56)));
+ ASSERT_TRUE(b.SetFromString(std::string(
+ reinterpret_cast<const char*>(kNISTTestVectors[11].affine), 56)));
p224::Negate(b, &minus_b);
p224::Add(a, b, &sum);