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

Unified Diff: chrome/browser/sync/test/integration/sync_arc_package_helper.cc

Issue 2723073002: Extract kArcEnabled preference from ArcSessionManager part 2. (Closed)
Patch Set: address comments Created 3 years, 10 months 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 0dcb2cf649782baa31f26a32b7b49d308b0fd7e1..1012c0cfcb6f9b8daf9d12f1c34d9ae08e0d1348 100644
--- a/chrome/browser/sync/test/integration/sync_arc_package_helper.cc
+++ b/chrome/browser/sync/test/integration/sync_arc_package_helper.cc
@@ -10,6 +10,8 @@
#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_notification.h"
+#include "chrome/browser/chromeos/arc/arc_service_launcher.h"
#include "chrome/browser/chromeos/arc/arc_session_manager.h"
#include "chrome/browser/chromeos/arc/arc_util.h"
#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ -150,11 +152,9 @@ void SyncArcPackageHelper::SetupArcService(Profile* profile, size_t id) {
chromeos::ProfileHelper::Get()->SetUserToProfileMappingForTesting(user,
profile);
- ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
- DCHECK(arc_session_manager);
ArcSessionManager::DisableUIForTesting();
- arc_session_manager->SetProfile(profile);
- arc_session_manager->StartPreferenceHandler();
+ ArcAuthNotification::DisableForTesting();
+ arc::ArcServiceLauncher::Get()->OnPrimaryUserProfilePrepared(profile);
arc::SetArcPlayStoreEnabledForProfile(profile, true);
ArcAppListPrefs* arc_app_list_prefs = ArcAppListPrefs::Get(profile);
« no previous file with comments | « chrome/browser/chromeos/arc/arc_session_manager_unittest.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698