Update from https://crrev.com/320343

base/strings/string_piece_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 584 matching lines @@
 }
 
 TYPED_TEST(CommonStringPieceTest, CheckComparisons2) {
   TypeParam alphabet(TestFixture::as_string("abcdefghijklmnopqrstuvwxyz"));
   TypeParam alphabet_z(TestFixture::as_string("abcdefghijklmnopqrstuvwxyzz"));
   TypeParam alphabet_y(TestFixture::as_string("abcdefghijklmnopqrstuvwxyy"));
   BasicStringPiece<TypeParam> abc(alphabet);
 
   // check comparison operations on strings longer than 4 bytes.
   ASSERT_TRUE(abc == BasicStringPiece<TypeParam>(alphabet));
-  ASSERT_TRUE(abc.compare(BasicStringPiece<TypeParam>(alphabet)) == 0);
+  ASSERT_EQ(abc.compare(BasicStringPiece<TypeParam>(alphabet)), 0);
 
   ASSERT_TRUE(abc < BasicStringPiece<TypeParam>(alphabet_z));
-  ASSERT_TRUE(abc.compare(BasicStringPiece<TypeParam>(alphabet_z)) < 0);
+  ASSERT_LT(abc.compare(BasicStringPiece<TypeParam>(alphabet_z)), 0);
 
   ASSERT_TRUE(abc > BasicStringPiece<TypeParam>(alphabet_y));
-  ASSERT_TRUE(abc.compare(BasicStringPiece<TypeParam>(alphabet_y)) > 0);
+  ASSERT_GT(abc.compare(BasicStringPiece<TypeParam>(alphabet_y)), 0);
 }
 
 // Test operations only supported by std::string version.
 TEST(StringPieceTest, CheckComparisons2) {
   StringPiece abc("abcdefghijklmnopqrstuvwxyz");
 
   // starts_with
   ASSERT_TRUE(abc.starts_with(abc));
   ASSERT_TRUE(abc.starts_with("abcdefghijklm"));
   ASSERT_TRUE(!abc.starts_with("abcdefguvwxyz"));
@@ skipping 58 matching lines @@
   ASSERT_TRUE(empty == BasicStringPiece<TypeParam>(NULL,
       static_cast<typename BasicStringPiece<TypeParam>::size_type>(0)));
   ASSERT_TRUE(empty == BasicStringPiece<TypeParam>());
   ASSERT_TRUE(str == BasicStringPiece<TypeParam>(str.begin(), str.end()));
   ASSERT_TRUE(empty == BasicStringPiece<TypeParam>(str.begin(), str.begin()));
   ASSERT_TRUE(empty == BasicStringPiece<TypeParam>(empty));
   ASSERT_TRUE(empty == BasicStringPiece<TypeParam>(empty.begin(), empty.end()));
 }
 
 }  // namespace base