Resolve initialize/destory order between ArcService and ArcSessionManager.

components/arc/arc_service_manager.cc

Index: components/arc/arc_service_manager.cc
diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
index 6d6a25f5fdf87cc191176b86f63f1177cde0239f..d6a68dc335c570ffab4f8f0d34ecc31adb816632 100644
--- a/components/arc/arc_service_manager.cc
+++ b/components/arc/arc_service_manager.cc
@@ -11,28 +11,12 @@
 #include "base/threading/thread_task_runner_handle.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/kiosk/arc_kiosk_bridge.h"
-#include "components/arc/metrics/arc_metrics_service.h"
-#include "components/arc/net/arc_net_host_impl.h"
-#include "components/arc/obb_mounter/arc_obb_mounter_bridge.h"
-#include "components/arc/power/arc_power_bridge.h"
-#include "components/arc/storage_manager/arc_storage_manager.h"
-#include "components/arc/user_data/arc_user_data_service.h"
-#include "components/prefs/pref_member.h"
-#include "ui/arc/notification/arc_notification_manager.h"
 
 namespace arc {
 
 namespace {
 
-// Weak pointer.  This class is owned by ChromeBrowserMainPartsChromeos.
+// Weak pointer.  This class is owned by arc::ArcServiceLauncher.
 ArcServiceManager* g_arc_service_manager = nullptr;
 
 // This pointer is owned by ArcServiceManager.
@@ -54,20 +38,6 @@ ArcServiceManager::ArcServiceManager(
   } else {
     arc_bridge_service_.reset(new ArcBridgeServiceImpl(blocking_task_runner));
   }
-
-  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<ArcKioskBridge>(arc_bridge_service()));
-  AddService(base::MakeUnique<ArcMetricsService>(arc_bridge_service()));
-  AddService(base::MakeUnique<ArcNetHostImpl>(arc_bridge_service()));
-  AddService(base::MakeUnique<ArcObbMounterBridge>(arc_bridge_service()));
-  AddService(base::MakeUnique<ArcPowerBridge>(arc_bridge_service()));
-  AddService(base::MakeUnique<ArcStorageManager>(arc_bridge_service()));
 }
 
 ArcServiceManager::~ArcServiceManager() {
@@ -93,18 +63,9 @@ ArcBridgeService* ArcServiceManager::arc_bridge_service() {
 
 void ArcServiceManager::AddService(std::unique_ptr<ArcService> service) {
   DCHECK(thread_checker_.CalledOnValidThread());
-
   services_.emplace_back(std::move(service));
 }
 
-void ArcServiceManager::OnPrimaryUserProfilePrepared(
-    const AccountId& account_id,
-    std::unique_ptr<BooleanPrefMember> arc_enabled_pref) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  AddService(base::MakeUnique<ArcNotificationManager>(arc_bridge_service(),
-                                                      account_id));
-}
-
 void ArcServiceManager::Shutdown() {
   icon_loader_ = nullptr;
   activity_resolver_ = nullptr;
@@ -115,9 +76,8 @@ void ArcServiceManager::Shutdown() {
 // static
 void ArcServiceManager::SetArcBridgeServiceForTesting(
     std::unique_ptr<ArcBridgeService> arc_bridge_service) {
-  if (g_arc_bridge_service_for_testing) {
+  if (g_arc_bridge_service_for_testing)
     delete g_arc_bridge_service_for_testing;
-  }
   g_arc_bridge_service_for_testing = arc_bridge_service.release();
 }