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

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

Issue 2723073002: Extract kArcEnabled preference from ArcSessionManager part 2. (Closed)
Patch Set: 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..ddaf929362ddf6f3a4044badb05000463d35f9f8 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"
@@ -153,8 +155,8 @@ void SyncArcPackageHelper::SetupArcService(Profile* profile, size_t id) {
ArcSessionManager* arc_session_manager = ArcSessionManager::Get();
maxbogue 2017/03/01 19:25:51 Is this line doing anything anymore?
hidehiko 2017/03/02 02:21:57 Good catch. Removed.
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);

Powered by Google App Engine
This is Rietveld 408576698