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

Unified Diff: chrome/browser/sync/test/integration/sync_arc_package_helper.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/sync/test/integration/sync_arc_package_helper.cc
diff --git a/chrome/browser/sync/test/integration/sync_arc_package_helper.cc b/chrome/browser/sync/test/integration/sync_arc_package_helper.cc
index 07f6d4d0b6c75904f12d3e924017e48510bae437..0516c2cec04de6278a2e076fe03c6e43fc5b9a4e 100644
--- a/chrome/browser/sync/test/integration/sync_arc_package_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_arc_package_helper.cc
@@ -10,7 +10,7 @@
#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"
@@ -80,7 +80,7 @@ void SyncArcPackageHelper::SetupTest(SyncTest* test) {
}
void SyncArcPackageHelper::CleanUp() {
- ArcAuthService::Get()->Shutdown();
+ ArcSessionManager::Get()->Shutdown();
user_manager_enabler_.reset();
}
@@ -154,11 +154,11 @@ void SyncArcPackageHelper::SetupArcService(Profile* profile, size_t id) {
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);
« no previous file with comments | « chrome/browser/prefs/browser_prefs.cc ('k') | chrome/browser/ui/app_list/app_list_service_views_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698