Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Unified Diff: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc

Issue 2507073002: Split ArcSessionManager from ArcAuthService. (Closed)
Patch Set: Fix rebase mistake Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
diff --git a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
index 9aa7fcc9e9a809b556fe2c376d27ba39344daefc..576874ac79c1d74eb1b00f989adf1dd5df20b38b 100644
--- a/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/arc_app_launcher_browsertest.cc
@@ -137,10 +137,12 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
void SetUpInProcessBrowserTestFixture() override {
ExtensionBrowserTest::SetUpInProcessBrowserTestFixture();
- arc::ArcAuthService::DisableUIForTesting();
+ arc::ArcSessionManager::DisableUIForTesting();
}
- void SetUpOnMainThread() override { arc::ArcAuthService::Get()->EnableArc(); }
+ void SetUpOnMainThread() override {
+ arc::ArcSessionManager::Get()->EnableArc();
+ }
void InstallTestApps(bool multi_app) {
app_host()->OnAppListRefreshed(GetTestAppsList(multi_app));
@@ -178,13 +180,13 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
void SendPackageRemoved() { app_host()->OnPackageRemoved(kTestAppPackage); }
void StartInstance() {
- if (auth_service()->profile() != profile())
- auth_service()->OnPrimaryUserProfilePrepared(profile());
+ if (arc_session_manager()->profile() != profile())
+ arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
app_instance_observer()->OnInstanceReady();
}
void StopInstance() {
- auth_service()->Shutdown();
+ arc_session_manager()->Shutdown();
app_instance_observer()->OnInstanceClosed();
}
@@ -201,7 +203,9 @@ class ArcAppLauncherBrowserTest : public ExtensionBrowserTest {
return app_prefs();
}
- arc::ArcAuthService* auth_service() { return arc::ArcAuthService::Get(); }
+ arc::ArcSessionManager* arc_session_manager() {
+ return arc::ArcSessionManager::Get();
+ }
private:
DISALLOW_COPY_AND_ASSIGN(ArcAppLauncherBrowserTest);

Powered by Google App Engine
This is Rietveld 408576698