Fix ArcBridgeBootstrap race issues.

components/arc/arc_service_manager.cc

 // Copyright 2015 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 "components/arc/arc_service_manager.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "components/arc/arc_bridge_bootstrap.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/arc_bridge_service_impl.h"
 #include "components/arc/audio/arc_audio_bridge.h"
 #include "components/arc/bluetooth/arc_bluetooth_bridge.h"
 #include "components/arc/boot_phase_monitor/arc_boot_phase_monitor_bridge.h"
 #include "components/arc/clipboard/arc_clipboard_bridge.h"
 #include "components/arc/crash_collector/arc_crash_collector_bridge.h"
 #include "components/arc/ime/arc_ime_service.h"
 #include "components/arc/intent_helper/activity_icon_loader.h"
 #include "components/arc/metrics/arc_metrics_service.h"
@@ skipping 22 matching lines @@
     : blocking_task_runner_(blocking_task_runner),
       icon_loader_(new ActivityIconLoader),
       activity_resolver_(new LocalActivityResolver) {
   DCHECK(!g_arc_service_manager);
   g_arc_service_manager = this;
 
   if (g_arc_bridge_service_for_testing) {
     arc_bridge_service_.reset(g_arc_bridge_service_for_testing);
     g_arc_bridge_service_for_testing = nullptr;
   } else {
-    arc_bridge_service_.reset(new ArcBridgeServiceImpl(
-        ArcBridgeBootstrap::Create()));
+    arc_bridge_service_.reset(new ArcBridgeServiceImpl());
   }
 
   AddService(base::MakeUnique<ArcAudioBridge>(arc_bridge_service()));
   AddService(base::MakeUnique<ArcBluetoothBridge>(arc_bridge_service()));
   AddService(base::MakeUnique<ArcBootPhaseMonitorBridge>(arc_bridge_service()));
   AddService(base::MakeUnique<ArcClipboardBridge>(arc_bridge_service()));
   AddService(base::MakeUnique<ArcCrashCollectorBridge>(arc_bridge_service(),
                                                        blocking_task_runner_));
   AddService(base::MakeUnique<ArcImeService>(arc_bridge_service()));
   AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service()));
@@ skipping 47 matching lines @@
 // static
 void ArcServiceManager::SetArcBridgeServiceForTesting(
     std::unique_ptr<ArcBridgeService> arc_bridge_service) {
   if (g_arc_bridge_service_for_testing) {
     delete g_arc_bridge_service_for_testing;
   }
   g_arc_bridge_service_for_testing = arc_bridge_service.release();
 }
 
 }  // namespace arc