Split ArcSessionManager from ArcAuthService.

chrome/browser/ui/app_list/arc/arc_app_test.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/app_list/arc/arc_app_test.h"
 
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.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/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs_factory.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/test/fake_app_instance.h"
@@ skipping 106 matching lines @@
 
   // A valid |arc_app_list_prefs_| is needed for the Arc bridge service and the
   // Arc auth service.
   arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
   if (!arc_app_list_pref_) {
     ArcAppListPrefsFactory::GetInstance()->RecreateServiceInstanceForTesting(
         profile_);
   }
   bridge_service_.reset(new arc::FakeArcBridgeService());
 
-  auth_service_.reset(new arc::ArcAuthService(bridge_service_.get()));
-  DCHECK(arc::ArcAuthService::Get());
-  arc::ArcAuthService::DisableUIForTesting();
-  arc_auth_service()->OnPrimaryUserProfilePrepared(profile_);
+  arc_session_manager_.reset(new arc::ArcSessionManager(bridge_service_.get()));
+  DCHECK(arc::ArcSessionManager::Get());
+  arc::ArcSessionManager::DisableUIForTesting();
+  arc_session_manager_->OnPrimaryUserProfilePrepared(profile_);
 
   arc_app_list_pref_ = ArcAppListPrefs::Get(profile_);
   DCHECK(arc_app_list_pref_);
   base::RunLoop run_loop;
   arc_app_list_pref_->SetDefaltAppsReadyCallback(run_loop.QuitClosure());
   run_loop.Run();
 
-  auth_service_->EnableArc();
+  arc_session_manager_->EnableArc();
   app_instance_.reset(new arc::FakeAppInstance(arc_app_list_pref_));
   bridge_service_->app()->SetInstance(app_instance_.get());
 
   // Check initial conditions.
   EXPECT_EQ(bridge_service_.get(), arc::ArcBridgeService::Get());
   EXPECT_FALSE(arc::ArcBridgeService::Get()->ready());
 }
 
 void ArcAppTest::TearDown() {
-  auth_service_.reset();
+  arc_session_manager_.reset();
   if (dbus_thread_manager_initialized_) {
     // DBusThreadManager may be initialized from other testing utility,
     // such as ash::test::AshTestHelper::SetUp(), so Shutdown() only when
     // it is initialized in ArcAppTest::SetUp().
     chromeos::DBusThreadManager::Shutdown();
     dbus_thread_manager_initialized_ = false;
   }
 }
 
 void ArcAppTest::StopArcInstance() {
@@ skipping 29 matching lines @@
   }
 }
 
 bool ArcAppTest::FindPackage(const arc::mojom::ArcPackageInfo& package) {
   for (auto fake_package : fake_packages_) {
     if (package.package_name == fake_package.package_name)
       return true;
   }
   return false;
 }