arc: Add ArcServiceManager to own all future ARC services

chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc

 // Copyright 2013 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 "chrome/browser/ui/ash/chrome_shell_delegate.h"
 
 #include "ash/accelerators/magnifier_key_scroller.h"
 #include "ash/accelerators/spoken_feedback_toggler.h"
 #include "ash/accessibility_delegate.h"
 #include "ash/wm/mru_window_tracker.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/ui/ash/media_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/session_state_delegate_chromeos.h"
 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h"
 #include "chrome/browser/ui/aura/accessibility/automation_manager_aura.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #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"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 void InitAfterFirstSessionStart() {
   // Restore focus after the user session is started.  It's needed because some
@@ skipping 262 matching lines @@
 ChromeShellDelegate::ArcSessionObserver::ArcSessionObserver() {
   ash::Shell::GetInstance()->AddShellObserver(this);
 }
 
 ChromeShellDelegate::ArcSessionObserver::~ArcSessionObserver() {
   ash::Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 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:
     case ash::user::LOGGED_IN_OWNER:
     case ash::user::LOGGED_IN_GUEST:
     case ash::user::LOGGED_IN_PUBLIC:
     case ash::user::LOGGED_IN_SUPERVISED:
       if (arc::ArcBridgeService::GetEnabled(
               base::CommandLine::ForCurrentProcess())) {
-        arc::ArcBridgeService::Get()->HandleStartup();
+        arc_bridge_service->HandleStartup();
       }
       break;
   }
 }