Fix ArcBridgeBootstrap race issues.

chrome/browser/policy/policy_browsertest.cc

Index: chrome/browser/policy/policy_browsertest.cc
diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc
index 446d632117e4ad244b1fc732ff7684d9c0610125..576bbb9a9ac0f82e2c1c564867b6e12b4104cf8c 100644
--- a/chrome/browser/policy/policy_browsertest.cc
+++ b/chrome/browser/policy/policy_browsertest.cc
@@ -212,7 +212,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/signin/core/account_id/account_id.h"
 #include "components/user_manager/user_manager.h"
 #include "ui/keyboard/keyboard_util.h"
@@ -3881,7 +3880,8 @@ IN_PROC_BROWSER_TEST_F(PolicyTest, UnifiedDesktopEnabledByDefault) {
   EXPECT_FALSE(display_manager->unified_desktop_enabled());
 }
 
-class ArcPolicyTest : public PolicyTest {
+class ArcPolicyTest : public PolicyTest,
+                      public arc::ArcBridgeServiceImpl::Delegate {
  public:
   ArcPolicyTest() {}
   ~ArcPolicyTest() override {}
@@ -3905,11 +3905,10 @@ class ArcPolicyTest : public PolicyTest {
         std::unique_ptr<chromeos::SessionManagerClient>(
             fake_session_manager_client_));
 
-    fake_arc_bridge_instance_.reset(new arc::FakeArcBridgeInstance);
-    arc::ArcServiceManager::SetArcBridgeServiceForTesting(
-        base::WrapUnique(new arc::ArcBridgeServiceImpl(
-            base::WrapUnique(new arc::FakeArcBridgeBootstrap(
-                fake_arc_bridge_instance_.get())))));
+    std::unique_ptr<arc::ArcBridgeServiceImpl> service(
+        new arc::ArcBridgeServiceImpl);
+    service->SetDelegateForTesting(this);
+    arc::ArcServiceManager::SetArcBridgeServiceForTesting(std::move(service));
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
@@ -3919,8 +3918,12 @@ class ArcPolicyTest : public PolicyTest {
   }
 
  private:
+  // ArcBridgeServiceImpl::Delegate override:
+  std::unique_ptr<arc::ArcBridgeBootstrap> CreateBootstrap() override {
+    return base::WrapUnique(new arc::FakeArcBridgeBootstrap);
+  }
+
   chromeos::FakeSessionManagerClient *fake_session_manager_client_;
-  std::unique_ptr<arc::FakeArcBridgeInstance> fake_arc_bridge_instance_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcPolicyTest);
 };