Split ArcSessionManager from ArcAuthService.

chrome/browser/sync/test/integration/sync_arc_package_helper.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/sync/test/integration/sync_arc_package_helper.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
-#include "chrome/browser/chromeos/arc/arc_auth_service.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
 #include "chromeos/chromeos_switches.h"
@@ skipping 49 matching lines @@
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableArc);
   ArcAppListPrefsFactory::SetFactoryForSyncTest();
   size_t id = 0;
   for (auto* profile : test_->GetAllProfiles())
     SetupArcService(profile, id++);
   setup_completed_ = true;
 }
 
 void SyncArcPackageHelper::CleanUp() {
-  ArcAuthService::Get()->Shutdown();
+  ArcSessionManager::Get()->Shutdown();
   user_manager_enabler_.reset();
 }
 
 void SyncArcPackageHelper::InstallPackageWithIndex(Profile* profile,
                                                    size_t id) {
   std::string package_name = GetTestPackageName(id);
 
   mojom::ArcPackageInfo package;
   package.package_name = package_name;
   package.package_version = id;
@@ skipping 53 matching lines @@
 void SyncArcPackageHelper::SetupArcService(Profile* profile, size_t id) {
   DCHECK(profile);
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       chromeos::switches::kEnableArc);
   const user_manager::User* user = CreateUserAndLogin(profile, id);
   // Have the user-to-profile mapping ready to avoid using the real profile
   // manager (which is null).
   chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
                                                                     profile);
 
-  ArcAuthService* auth_service = ArcAuthService::Get();
-  DCHECK(auth_service);
-  ArcAuthService::DisableUIForTesting();
-  auth_service->OnPrimaryUserProfilePrepared(profile);
-  auth_service->EnableArc();
+  ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
+  DCHECK(arc_session_manager);
+  ArcSessionManager::DisableUIForTesting();
+  arc_session_manager->OnPrimaryUserProfilePrepared(profile);
+  arc_session_manager->EnableArc();
 
   ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);
   DCHECK(arc_app_list_prefs);
 
   base::RunLoop run_loop;
   arc_app_list_prefs->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
   run_loop.Run();
 
   instance_map_[profile] =
       base::MakeUnique<FakeAppInstance>(arc_app_list_prefs);
@@ skipping 79 matching lines @@
     if (package1_info->last_backup_android_id !=
         package2_info->last_backup_android_id)
       return false;
     if (package1_info->last_backup_time != package2_info->last_backup_time)
       return false;
   }
   return true;
 }
 
 }  // namespace arc