Enable libc++ on Android

net/spdy/spdy_prefixed_buffer_reader_test.cc

Index: net/spdy/spdy_prefixed_buffer_reader_test.cc
diff --git a/net/spdy/spdy_prefixed_buffer_reader_test.cc b/net/spdy/spdy_prefixed_buffer_reader_test.cc
index e3a6a6552dc84b3004db8af57cf4f6b1dd321216..b73c22190ecaba1a0f3b8ed164cbd3a1395dbced 100644
--- a/net/spdy/spdy_prefixed_buffer_reader_test.cc
+++ b/net/spdy/spdy_prefixed_buffer_reader_test.cc
@@ -4,7 +4,6 @@
 
 #include "net/spdy/spdy_prefixed_buffer_reader.h"
 
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
@@ -12,7 +11,6 @@ namespace net {
 namespace test {
 
 using base::StringPiece;
-using testing::ElementsAreArray;
 
 class SpdyPrefixedBufferReaderTest : public ::testing::Test {
  protected:
@@ -32,7 +30,7 @@ TEST_F(SpdyPrefixedBufferReaderTest, ReadRawFromPrefix) {
   char buffer[] = "123456";
   EXPECT_FALSE(reader.ReadN(10, buffer));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("foobar"));
+  EXPECT_EQ(StringPiece(buffer), StringPiece("foobar"));

[Nico, 2015/01/29 22:51:33]

same question for this file

   EXPECT_EQ(0u, reader.Available());
 }
 
@@ -55,7 +53,7 @@ TEST_F(SpdyPrefixedBufferReaderTest, ReadRawFromSuffix) {
   char buffer[] = "123456";
   EXPECT_FALSE(reader.ReadN(10, buffer));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("foobar"));
+  EXPECT_EQ(StringPiece(buffer), StringPiece("foobar"));
   EXPECT_EQ(0u, reader.Available());
 }
 
@@ -78,7 +76,7 @@ TEST_F(SpdyPrefixedBufferReaderTest, ReadRawSpanning) {
   char buffer[] = "123456";
   EXPECT_FALSE(reader.ReadN(10, buffer));  // Not enough buffer.
   EXPECT_TRUE(reader.ReadN(6, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("foobar"));
+  EXPECT_EQ(StringPiece(buffer), StringPiece("foobar"));
   EXPECT_EQ(0u, reader.Available());
 }
 
@@ -102,11 +100,11 @@ TEST_F(SpdyPrefixedBufferReaderTest, ReadMixed) {
   SpdyPinnableBufferPiece piece;
 
   EXPECT_TRUE(reader.ReadN(3, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("abc4"));
+  EXPECT_EQ(StringPiece(buffer), StringPiece("abc4"));
   EXPECT_EQ(8u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(2, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("dec4"));
+  EXPECT_EQ(StringPiece(buffer), StringPiece("dec4"));
   EXPECT_EQ(6u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(3, &piece));
@@ -120,7 +118,7 @@ TEST_F(SpdyPrefixedBufferReaderTest, ReadMixed) {
   EXPECT_EQ(1u, reader.Available());
 
   EXPECT_TRUE(reader.ReadN(1, buffer));
-  EXPECT_THAT(buffer, ElementsAreArray("lec4"));
+  EXPECT_EQ(StringPiece(buffer), StringPiece("lec4"));
   EXPECT_EQ(0u, reader.Available());
 }