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..ccefe4df6df697a4fa1645b1ace9bfbdf0329f17 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"
@@ -111,7 +110,8 @@ class ArcAuthServiceShutdownObserver : public ArcAuthServiceObserver {
   DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceShutdownObserver);
 };
 
-class ArcAuthServiceTest : public InProcessBrowserTest {
+class ArcAuthServiceTest : public InProcessBrowserTest,
+                           public ArcBridgeServiceImpl::Delegate {
  protected:
   ArcAuthServiceTest() {}
 
@@ -140,10 +140,9 @@ 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->SetDelegateForTesting(this);
+    ArcServiceManager::SetArcBridgeServiceForTesting(std::move(service));
   }
 
   void SetUpOnMainThread() override {
@@ -205,8 +204,12 @@ class ArcAuthServiceTest : public InProcessBrowserTest {
   FakeProfileOAuth2TokenService* token_service() { return token_service_; }
 
  private:
+  // ArcBridgeServiceImpl::Delegate override:
+  std::unique_ptr<ArcBridgeBootstrap> CreateBootstrap() override {
+    return base::WrapUnique(new FakeArcBridgeBootstrap);

[Luis Héctor Chávez, 2016/09/07 23:38:32]

prefer base::MakeUnique<FakeArcBridgeBootstrap>(). Same in all other places you
build one of these objects.

[hidehiko, 2016/09/08 16:53:41]

Acknowledged.

+  }
+
   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_;