Re-land: Roll gtest.

net/socket/sequenced_socket_data_unittest.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
@@ skipping 652 matching lines @@
   {
     ::testing::ScopedFakeTestPartResultReporter gtest_reporter(
         ::testing::ScopedFakeTestPartResultReporter::
             INTERCEPT_ONLY_CURRENT_THREAD,
         &gtest_failures);
     AssertSyncWriteEquals(kMsg1, kLen1 - 1);
   }
 
   static const char* kExpectedFailures[] = {
       "Expected: (data.length()) >= (expected_data.length())",
-      "Value of: actual_data",
-      "Value of: sock_->Write(buf.get(), len, failing_callback_)"};
+      "To be equal to: actual_data",
+      "To be equal to: sock_->Write(buf.get(), len, failing_callback_)"};
   ASSERT_EQ(arraysize(kExpectedFailures),
             static_cast<size_t>(gtest_failures.size()));
 
   for (int i = 0; i < gtest_failures.size(); ++i) {
     const ::testing::TestPartResult& result =
         gtest_failures.GetTestPartResult(i);
     EXPECT_TRUE(strstr(result.message(), kExpectedFailures[i]) != NULL);
   }
 
   set_expect_eof(false);
@@ skipping 562 matching lines @@
 
   Resume();
   ASSERT_FALSE(IsPaused());
   ASSERT_TRUE(write_callback_.have_result());
   ASSERT_EQ(kLen2, write_callback_.WaitForResult());
 }
 
 }  // namespace
 
 }  // namespace net