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

Unified Diff: chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc

Issue 2711033002: Fix Arc integration test. (Closed)
Patch Set: Rebase 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/ui/app_list/arc/arc_package_sync_data_type_controller.cc
diff --git a/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc b/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc
index 293b5d6947c0ca2a2460d02ada3754f3128a11a3..b7c1d9aea05f7c18047bd6e88d097d2477732b95 100644
--- a/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc
+++ b/chrome/browser/ui/app_list/arc/arc_package_sync_data_type_controller.cc
@@ -14,18 +14,6 @@
#include "components/sync/driver/sync_client.h"
#include "components/sync/driver/sync_service.h"
-// ArcPackage sync service is controlled by apps checkbox in sync settings. ARC
-// apps and regular Chrome apps have same user control.
-namespace {
-
-// Indicates whether ARC is enabled on this machine.
-bool IsArcEnabled(Profile* profile) {
- return arc::IsArcAllowedForProfile(profile) &&
- profile->GetPrefs()->GetBoolean(prefs::kArcEnabled);
-}
-
-} // namespace
-
ArcPackageSyncDataTypeController::ArcPackageSyncDataTypeController(
syncer::ModelType type,
const base::Closure& dump_stack,
@@ -49,7 +37,7 @@ ArcPackageSyncDataTypeController::~ArcPackageSyncDataTypeController() {
bool ArcPackageSyncDataTypeController::ReadyForStart() const {
DCHECK(CalledOnValidThread());
- return IsArcEnabled(profile_) && ShouldSyncArc();
+ return arc::IsArcPlayStoreEnabledForProfile(profile_) && ShouldSyncArc();
hidehiko 2017/02/24 18:22:27 Wow, thank you for the fix!
}
bool ArcPackageSyncDataTypeController::StartModels() {

Powered by Google App Engine
This is Rietveld 408576698