Revert of Report CHECK/DCHECK to test launcher summary output.

ios/chrome/browser/ui/collection_view/collection_view_model_unittest.mm

 // Copyright 2016 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.
 
 #import "ios/chrome/browser/ui/collection_view/collection_view_model.h"
 
-#include "base/bind.h"
-#include "base/logging.h"
 #include "base/mac/foundation_util.h"
-#include "base/strings/string_piece.h"
 #import "ios/chrome/browser/ui/collection_view/cells/collection_view_item.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 @interface CollectionViewModel (Testing)
 // Adds an item with the given type to the section with the given identifier.
@@ skipping 29 matching lines @@
   ItemTypeCheeseHeader = kItemTypeEnumZero,
   ItemTypeCheeseCheddar,
   ItemTypeCheeseGouda,
   ItemTypeCheesePepperJack,
   ItemTypeWeasleyRon,
   ItemTypeWeasleyGinny,
   ItemTypeWeasleyArthur,
   ItemTypeWeasleyFooter,
 };
 
-void LogSink(const char* file,
-             int line,
-             const base::StringPiece message,
-             const base::StringPiece stack_trace) {
+void LogSink(const std::string& str) {
   // No-op.
 }
 
 // Test generic model boxing (check done at compilation time).
 TEST(CollectionViewModelTest, GenericModelBoxing) {
   CollectionViewModel<TestCollectionViewItemSubclass*>* specificModel =
       [[CollectionViewModel alloc] init];
 
   // |generalModel| is a superclass of |specificModel|. So specificModel can be
   // boxed into generalModel, but not the other way around.
@@ skipping 237 matching lines @@
   EXPECT_EQ(3U, [cheeseItems count]);
   EXPECT_NSEQ(cheddar, cheeseItems[0]);
   EXPECT_NSEQ(pepperJack, cheeseItems[1]);
   EXPECT_NSEQ(gouda, cheeseItems[2]);
 }
 
 TEST(CollectionViewModelTest, InvalidIndexPath) {
   CollectionViewModel* model = [[CollectionViewModel alloc] init];
   [model addSectionWithIdentifier:SectionIdentifierCheese];
 
-  logging::ScopedLogAssertHandler scoped_assert_handler(base::Bind(LogSink));
+  logging::SetLogAssertHandler(&LogSink);
   bool out_of_bounds_exception_thrown = false;
   @try {
     [model indexInItemTypeForIndexPath:[NSIndexPath indexPathForItem:0
                                                            inSection:0]];
   } @catch (NSException* exception) {
     if ([[exception name] isEqualToString:NSRangeException]) {
       out_of_bounds_exception_thrown = true;
     }
   }
   EXPECT_TRUE(out_of_bounds_exception_thrown);
+  logging::SetLogAssertHandler(nullptr);
 }
 
 TEST(CollectionViewModelTest, RemoveItems) {
   CollectionViewModel* model = [[CollectionViewModel alloc] init];
 
   [model addSectionWithIdentifier:SectionIdentifierCheese];
   [model addItemWithType:ItemTypeCheesePepperJack
       toSectionWithIdentifier:SectionIdentifierCheese];
   [model addItemWithType:ItemTypeCheeseGouda
       toSectionWithIdentifier:SectionIdentifierCheese];
@@ skipping 248 matching lines @@
 
   EXPECT_FALSE([model footerForSectionWithIdentifier:SectionIdentifierCheese]);
   EXPECT_FALSE([model footerForSection:cheeseSection]);
 
   EXPECT_EQ(weasleyFooter,
             [model footerForSectionWithIdentifier:SectionIdentifierWeasley]);
   EXPECT_EQ(weasleyFooter, [model footerForSection:weasleySection]);
 }
 
 }  // namespace