Split ArcSessionManager from ArcAuthService.

chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_controller.cc

 // Copyright 2016 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/launcher/arc_app_deferred_launcher_controller.h"
 
 #include "chrome/browser/chromeos/arc/arc_support_host.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_utils.h"
 #include "chrome/browser/ui/ash/launcher/arc_app_deferred_launcher_item_controller.h"
@@ skipping 41 matching lines @@
   const std::string shelf_app_id_;
   const gfx::ImageSkia image_;
 
   DISALLOW_COPY_AND_ASSIGN(SpinningEffectSource);
 };
 }  // namespace
 
 ArcAppDeferredLauncherController::ArcAppDeferredLauncherController(
     ChromeLauncherControllerImpl* owner)
     : owner_(owner), weak_ptr_factory_(this) {
-  if (arc::ArcAuthService::IsAllowedForProfile(owner->profile())) {
+  if (arc::ArcSessionManager::IsAllowedForProfile(owner->profile())) {
     observed_profile_ = owner->profile();
     ArcAppListPrefs::Get(observed_profile_)->AddObserver(this);
   }
-  arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
-  // arc::ArcAuthService might not be set in tests.
-  if (auth_service)
-    auth_service->AddObserver(this);
+  arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
+  // arc::ArcSessionManager might not be set in tests.
+  if (arc_session_manager)
+    arc_session_manager->AddObserver(this);
 }
 
 ArcAppDeferredLauncherController::~ArcAppDeferredLauncherController() {
-  arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
-  // arc::ArcAuthService may be released first.
-  if (auth_service)
-    auth_service->RemoveObserver(this);
+  arc::ArcSessionManager* arc_session_manager = arc::ArcSessionManager::Get();
+  // arc::ArcSessionManager may be released first.
+  if (arc_session_manager)
+    arc_session_manager->RemoveObserver(this);
   if (observed_profile_)
     ArcAppListPrefs::Get(observed_profile_)->RemoveObserver(this);
 }
 
 void ArcAppDeferredLauncherController::MaybeApplySpinningEffect(
     const std::string& shelf_app_id,
     gfx::ImageSkia* image) {
   DCHECK(image);
   if (app_controller_map_.find(shelf_app_id) == app_controller_map_.end())
     return;
@@ skipping 86 matching lines @@
 
 void ArcAppDeferredLauncherController::RegisterNextUpdate() {
   base::ThreadTaskRunnerHandle::Get()->PostDelayedTask(
       FROM_HERE, base::Bind(&ArcAppDeferredLauncherController::UpdateApps,
                             weak_ptr_factory_.GetWeakPtr()),
       base::TimeDelta::FromMilliseconds(kUpdateIconIntervalMs));
 }
 
 void ArcAppDeferredLauncherController::RegisterDeferredLaunch(
     const std::string& app_id) {
-  const arc::ArcAuthService* auth_service = arc::ArcAuthService::Get();
-  DCHECK(auth_service);
-  DCHECK(auth_service->state() != arc::ArcAuthService::State::STOPPED);
-  DCHECK(auth_service->state() != arc::ArcAuthService::State::NOT_INITIALIZED);
+  const arc::ArcSessionManager* arc_session_manager =
+      arc::ArcSessionManager::Get();
+  DCHECK(arc_session_manager);
+  DCHECK(arc_session_manager->state() !=
+         arc::ArcSessionManager::State::STOPPED);
+  DCHECK(arc_session_manager->state() !=
+         arc::ArcSessionManager::State::NOT_INITIALIZED);
 
   const std::string shelf_app_id =
       ArcAppWindowLauncherController::GetShelfAppIdFromArcAppId(app_id);
   const ash::ShelfID shelf_id = owner_->GetShelfIDForAppID(shelf_app_id);
 
   if (shelf_id) {
     LauncherItemController* controller =
         owner_->GetLauncherItemController(shelf_id);
     if (controller &&
         controller->type() != LauncherItemController::TYPE_SHORTCUT) {
@@ skipping 11 matching lines @@
   } else {
     owner_->SetItemController(shelf_id, controller);
     owner_->SetItemStatus(shelf_id, ash::STATUS_RUNNING);
   }
 
   if (app_controller_map_.empty())
     RegisterNextUpdate();
 
   app_controller_map_[shelf_app_id] = controller;
 }