Simplify registration of a test ChromeBrowserStateManager.

ios/chrome/browser/signin/authentication_service_unittest.mm

 // Copyright 2013 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 "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/browser_sync/profile_sync_service_mock.h"
@@ skipping 18 matching lines @@
 #include "ios/chrome/browser/signin/fake_signin_manager_builder.h"
 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
 #include "ios/chrome/browser/signin/signin_client_factory.h"
 #include "ios/chrome/browser/signin/signin_client_impl.h"
 #include "ios/chrome/browser/signin/signin_error_controller_factory.h"
 #include "ios/chrome/browser/signin/signin_manager_factory.h"
 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_service_factory.h"
 #include "ios/chrome/browser/sync/ios_chrome_profile_sync_test_util.h"
 #include "ios/chrome/browser/sync/sync_setup_service_factory.h"
 #include "ios/chrome/browser/sync/sync_setup_service_mock.h"
-#include "ios/chrome/test/testing_application_context.h"
+#include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_state_manager.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #import "ios/public/provider/chrome/browser/signin/chrome_identity.h"
 #import "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 
 using testing::_;
@@ skipping 27 matching lines @@
       IOSChromeProfileSyncServiceFactory::GetForBrowserState(browser_state),
       browser_state->GetPrefs());
 }
 
 }  // namespace
 
 class AuthenticationServiceTest : public PlatformTest,
                                   public OAuth2TokenService::Observer {
  protected:
   AuthenticationServiceTest()
-      : browser_state_manager_(base::FilePath()),
+      : scoped_browser_state_manager_(
+            base::MakeUnique<TestChromeBrowserStateManager>(base::FilePath())),
         refresh_token_available_count_(0) {}
 
   void SetUp() override {
     PlatformTest::SetUp();
 
-    TestingApplicationContext::GetGlobal()->SetChromeBrowserStateManager(
-        &browser_state_manager_);
-
     identity_service_ =
         ios::FakeChromeIdentityService::GetInstanceFromChromeProvider();
     identity_service_->AddIdentities(@[ @"foo", @"foo2" ]);
     identity_ =
         [identity_service_->GetAllIdentitiesSortedForDisplay() objectAtIndex:0];
     identity2_ =
         [identity_service_->GetAllIdentitiesSortedForDisplay() objectAtIndex:1];
 
     TestChromeBrowserState::Builder builder;
     builder.SetPrefService(CreatePrefService());
@@ skipping 31 matching lines @@
     RegisterBrowserStatePrefs(registry.get());
     return prefs;
   }
 
   void TearDown() override {
     OAuth2TokenServiceFactory::GetForBrowserState(browser_state_.get())
         ->RemoveObserver(this);
     authentication_service_->Shutdown();
     authentication_service_.reset();
     browser_state_.reset();
-    TestingApplicationContext::GetGlobal()->SetChromeBrowserStateManager(
-        nullptr);
     PlatformTest::TearDown();
   }
 
   void SetExpectationsForSignIn() {
     EXPECT_CALL(*profile_sync_service_mock_, RequestStart());
     EXPECT_CALL(*sync_setup_service_mock_, PrepareForFirstSyncSetup());
   }
 
   void CreateAuthenticationService() {
     if (authentication_service_.get()) {
       authentication_service_->Shutdown();
     }
-    authentication_service_.reset(new AuthenticationService(
+    authentication_service_ = base::MakeUnique<AuthenticationService>(
         browser_state_.get(),
         OAuth2TokenServiceFactory::GetForBrowserState(browser_state_.get()),
-        SyncSetupServiceFactory::GetForBrowserState(browser_state_.get())));
+        SyncSetupServiceFactory::GetForBrowserState(browser_state_.get()));
     authentication_service_->Initialize();
   }
 
   void StoreAccountsInPrefs() {
     authentication_service_->StoreAccountsInPrefs();
   }
 
   void MigrateAccountsStoredInPrefsIfNeeded() {
     authentication_service_->MigrateAccountsStoredInPrefsIfNeeded();
   }
@@ skipping 32 matching lines @@
   bool HasCachedMDMInfo(ChromeIdentity* identity) {
     return authentication_service_->cached_mdm_infos_.count(
                base::SysNSStringToUTF8([identity gaiaID])) > 0;
   }
 
   void OnRefreshTokenAvailable(const std::string& account_id) override {
     refresh_token_available_count_++;
   }
 
   web::TestWebThreadBundle thread_bundle_;
-  TestChromeBrowserStateManager browser_state_manager_;
-
+  IOSChromeScopedTestingChromeBrowserStateManager scoped_browser_state_manager_;
   std::unique_ptr<TestChromeBrowserState> browser_state_;
   ios::FakeChromeIdentityService* identity_service_;
   browser_sync::ProfileSyncServiceMock* profile_sync_service_mock_;
   SyncSetupServiceMock* sync_setup_service_mock_;
   SigninManager* signin_manager_;
   std::unique_ptr<AuthenticationService> authentication_service_;
   ChromeIdentity* identity_;
   ChromeIdentity* identity2_;
   int refresh_token_available_count_;
 };
@@ skipping 511 matching lines @@
   NSDictionary* user_info = [NSDictionary dictionary];
   SetCachedMDMInfo(identity_, user_info);
 
   EXPECT_CALL(*identity_service_,
               HandleMDMNotification(identity_, user_info, _))
       .WillOnce(Return(true));
 
   EXPECT_TRUE(
       authentication_service_->ShowMDMErrorDialogForIdentity(identity_));
 }