arc: Add ArcServiceManager to own all future ARC services

chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

Index: chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index ef02593ce831284bb86feea74c96f9e68c26e281..1ba2813e3dcef9b998ba44ed67c466da8247c0e6 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -37,6 +37,7 @@
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
+#include "components/arc/arc_service_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/user_metrics.h"
 #include "ui/aura/window.h"
@@ -319,13 +320,15 @@ ChromeShellDelegate::ArcSessionObserver::~ArcSessionObserver() {
 
 void ChromeShellDelegate::ArcSessionObserver::OnLoginStateChanged(
     ash::user::LoginStatus status) {
+  auto arc_bridge_service = arc::ArcServiceManager::Get()->arc_bridge_service();
+
   switch (status) {
     case ash::user::LOGGED_IN_LOCKED:
     case ash::user::LOGGED_IN_KIOSK_APP:
       return;
 
     case ash::user::LOGGED_IN_NONE:
-      arc::ArcBridgeService::Get()->Shutdown();
+      arc_bridge_service->Shutdown();

[oshima, 2015/12/04 18:33:34]

I actually have a slight preference for the original style, but I'm ok if you
prefer this way.

[denniskempin, 2015/12/04 19:12:25]

Sure, I don't feel strongly about this!

       break;
 
     case ash::user::LOGGED_IN_USER:
@@ -335,7 +338,7 @@ void ChromeShellDelegate::ArcSessionObserver::OnLoginStateChanged(
     case ash::user::LOGGED_IN_SUPERVISED:
       if (arc::ArcBridgeService::GetEnabled(
               base::CommandLine::ForCurrentProcess())) {
-        arc::ArcBridgeService::Get()->HandleStartup();
+        arc_bridge_service->HandleStartup();
       }
       break;
   }