Fix LoggingTest.NestedLogAssertHandlers in official build.

base/logging_unittest.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/strings/string_piece.h"
@@ skipping 501 matching lines @@
     CHECK_EQ(false, true);           // Unreached.
 }
 
 TEST_F(LoggingTest, NestedLogAssertHandlers) {
   ::testing::InSequence dummy;
   ::testing::StrictMock<MockLogAssertHandler> handler_a, handler_b;
 
   EXPECT_CALL(
       handler_a,
       HandleLogAssert(
+          _, _, base::StringPiece("First assert must be catched by handler_a"),

[hans, 2017/04/20 17:28:39]

Since you're changing this anyway, s/catched/caught/ here and below.

+          _));
+  EXPECT_CALL(
+      handler_b,
+      HandleLogAssert(
+          _, _, base::StringPiece("Second assert must be catched by handler_b"),
+          _));
+  EXPECT_CALL(
+      handler_a,
+      HandleLogAssert(
           _, _,
-          base::StringPiece(
-              "Check failed: false. First assert must be catched by handler_a"),
+          base::StringPiece("Last assert must be catched by handler_a again"),
           _));
-  EXPECT_CALL(
-      handler_b,
-      HandleLogAssert(_, _,
-                      base::StringPiece("Check failed: false. Second assert "
-                                        "must be catched by handler_b"),
-                      _));
-  EXPECT_CALL(
-      handler_a,
-      HandleLogAssert(_, _,
-                      base::StringPiece("Check failed: false. Last assert "
-                                        "must be catched by handler_a again"),
-                      _));
 
   logging::ScopedLogAssertHandler scoped_handler_a(base::Bind(
       &MockLogAssertHandler::HandleLogAssert, base::Unretained(&handler_a)));
 
-  CHECK(false) << "First assert must be catched by handler_a";
+  LOG(FATAL) << "First assert must be catched by handler_a";
 
   {
     logging::ScopedLogAssertHandler scoped_handler_b(base::Bind(
         &MockLogAssertHandler::HandleLogAssert, base::Unretained(&handler_b)));
-    CHECK(false) << "Second assert must be catched by handler_b";
+    LOG(FATAL) << "Second assert must be catched by handler_b";
   }
 
-  CHECK(false) << "Last assert must be catched by handler_a again";
+  LOG(FATAL) << "Last assert must be catched by handler_a again";
 }
 
 // Test that defining an operator<< for a type in a namespace doesn't prevent
 // other code in that namespace from calling the operator<<(ostream, wstring)
 // defined by logging.h. This can fail if operator<<(ostream, wstring) can't be
 // found by ADL, since defining another operator<< prevents name lookup from
 // looking in the global namespace.
 namespace nested_test {
   class Streamable {};
   ALLOW_UNUSED_TYPE std::ostream& operator<<(std::ostream& out,
                                              const Streamable&) {
     return out << "Streamable";
   }
   TEST_F(LoggingTest, StreamingWstringFindsCorrectOperator) {
     std::wstring wstr = L"Hello World";
     std::ostringstream ostr;
     ostr << wstr;
     EXPECT_EQ("Hello World", ostr.str());
   }
 }  // namespace nested_test
 
 }  // namespace
 
 }  // namespace logging