Revert of Use ChromeBrowserStateManager instead of BrowserListIOS.

ios/chrome/browser/tabs/tab_unittest.mm

 // Copyright 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.
 
 #import <UIKit/UIKit.h>
 
 #include <memory>
 
 #include "base/callback.h"
-#include "base/files/file_path.h"
 #include "base/ios/block_types.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/keyed_service/core/service_access_type.h"
 #include "ios/chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
-#include "ios/chrome/browser/browser_state/test_chrome_browser_state_manager.h"
 #import "ios/chrome/browser/chrome_url_util.h"
 #include "ios/chrome/browser/history/history_service_factory.h"
 #import "ios/chrome/browser/tabs/tab.h"
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/tabs/tab_private.h"
 #import "ios/chrome/browser/ui/open_in_controller.h"
 #import "ios/chrome/browser/ui/open_in_controller_testing.h"
 #import "ios/chrome/browser/web/external_app_launcher.h"
 #include "ios/chrome/test/block_cleanup_test.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h"
-#include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_state_manager.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_local_state.h"
 #import "ios/public/provider/chrome/browser/native_app_launcher/fake_native_app_metadata.h"
 #import "ios/public/provider/chrome/browser/native_app_launcher/fake_native_app_whitelist_manager.h"
 #include "ios/public/provider/chrome/browser/test_chrome_browser_provider.h"
 #import "ios/testing/ocmock_complex_type_helper.h"
 #import "ios/web/navigation/crw_session_controller.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #include "ios/web/public/navigation_item.h"
 #import "ios/web/public/navigation_manager.h"
 #include "ios/web/public/referrer.h"
@@ skipping 111 matching lines @@
   id<NativeAppWhitelistManager> GetNativeAppWhitelistManager() const override {
     return manager_;
   }
 
  private:
   base::scoped_nsprotocol<id<NativeAppWhitelistManager>> manager_;
 };
 
 class TabTest : public BlockCleanupTest {
  public:
-  TabTest()
-      : thread_bundle_(web::TestWebThreadBundle::REAL_FILE_THREAD),
-        scoped_browser_state_manager_(
-            base::MakeUnique<TestChromeBrowserStateManager>(base::FilePath())) {
-  }
+  TabTest() : thread_bundle_(web::TestWebThreadBundle::REAL_FILE_THREAD) {}
 
   void SetUp() override {
     BlockCleanupTest::SetUp();
 
     [[ChromeAppConstants sharedInstance]
         setCallbackSchemeForTesting:@"chromium"];
 
     // Set up the testing profiles.
     TestChromeBrowserState::Builder test_cbs_builder;
     chrome_browser_state_ = test_cbs_builder.Build();
@@ skipping 129 matching lines @@
       NSLog(@"title = %@; url = %@", base::SysUTF16ToNSString(result->title()),
             base::SysUTF8ToNSString(result->url().spec()));
     }
   }
 #endif
 
   virtual bool UseOffTheRecordBrowserState() const { return false; }
 
  protected:
   web::TestWebThreadBundle thread_bundle_;
-  IOSChromeScopedTestingChromeBrowserStateManager scoped_browser_state_manager_;
+  IOSChromeScopedTestingLocalState local_state_;
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
   base::scoped_nsobject<Tab> tab_;
   history::HistoryService* history_service_;  // weak
   CRWWebController* mock_web_controller_;     // weak
   base::scoped_nsobject<UIView> web_controller_view_;
   base::scoped_nsobject<ArrayTabModel> tabModel_;
   base::scoped_nsobject<id> mock_external_app_launcher_;
 };
 
 TEST_F(TabTest, AddToHistoryWithRedirect) {
@@ skipping 218 matching lines @@
   base::scoped_nsobject<FakeNativeAppMetadata> metadata(
       [[FakeNativeAppMetadata alloc] init]);
 
   // Turn auto open on.
   [metadata setShouldAutoOpenLinks:YES];
   int expectedCallCount = 2;
   TestOpenNativeAppURL(testURL, NO, expectedCallCount, NO);
   EXPECT_FALSE([metadata shouldAutoOpenLinks]);
 }
 
+class TestRequestGroupID : public BlockCleanupTest {
+ public:
+  void SetUp() override { BlockCleanupTest::SetUp(); }
+  void TearDown() override { BlockCleanupTest::TearDown(); }
+};
+
 }  // namespace