Fix ArcBridgeBootstrap race issues.

chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc

Index: chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc
diff --git a/chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc b/chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc
index 85eab7e1fc8e2e234ab8a68acc5a45d4b9fdba9c..f94cc890b7189ac89466a7c569567a318a8030bb 100644
--- a/chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc
+++ b/chrome/browser/chromeos/arc/arc_auth_service_browsertest.cc
@@ -32,7 +32,6 @@
 #include "components/arc/arc_bridge_service_impl.h"
 #include "components/arc/arc_service_manager.h"
 #include "components/arc/test/fake_arc_bridge_bootstrap.h"
-#include "components/arc/test/fake_arc_bridge_instance.h"
 #include "components/policy/core/common/policy_switches.h"
 #include "components/prefs/pref_member.h"
 #include "components/prefs/pref_service.h"
@@ -140,10 +139,10 @@ class ArcAuthServiceTest : public InProcessBrowserTest {
             fake_session_manager_client));
 
     // Mock out ARC bridge.
-    fake_arc_bridge_instance_.reset(new FakeArcBridgeInstance);
-    ArcServiceManager::SetArcBridgeServiceForTesting(
-        base::MakeUnique<ArcBridgeServiceImpl>(base::WrapUnique(
-            new FakeArcBridgeBootstrap(fake_arc_bridge_instance_.get()))));
+    std::unique_ptr<ArcBridgeServiceImpl> service(new ArcBridgeServiceImpl);
+    service->SetArcBridgeBootstrapFactoryForTesting(
+        base::Bind(FakeArcBridgeBootstrap::Create));
+    ArcServiceManager::SetArcBridgeServiceForTesting(std::move(service));
   }
 
   void SetUpOnMainThread() override {
@@ -206,7 +205,6 @@ class ArcAuthServiceTest : public InProcessBrowserTest {
 
  private:
   std::unique_ptr<policy::LocalPolicyTestServer> test_server_;
-  std::unique_ptr<FakeArcBridgeInstance> fake_arc_bridge_instance_;
   std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
   base::ScopedTempDir temp_dir_;
   std::unique_ptr<TestingProfile> profile_;