arc: Fix Android App resurrected by sync.

chrome/browser/ui/app_list/arc/arc_package_syncable_service.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service.h"
 
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
 #include "chrome/browser/ui/app_list/arc/arc_package_syncable_service_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/sync/api/sync_change_processor.h"
 #include "components/sync/api/sync_data.h"
 #include "components/sync/api/sync_merge_result.h"
-#include "components/sync/driver/pref_names.h"
-#include "components/sync/driver/sync_prefs.h"
-#include "components/sync/driver/sync_service.h"
 #include "components/sync/protocol/sync.pb.h"
 
 namespace arc {
 
 namespace {
 
 using syncer::SyncChange;
 using ArcSyncItem = ArcPackageSyncableService::SyncItem;
 
 constexpr int64_t kNoAndroidID = 0;
@@ skipping 38 matching lines @@
 
 // Creates new syncItem from ArcAppListPrefs::PackageInfo
 std::unique_ptr<ArcSyncItem> CreateSyncItemFromPrefs(
     std::unique_ptr<ArcAppListPrefs::PackageInfo> package_info) {
   DCHECK(package_info);
   return base::MakeUnique<ArcSyncItem>(
       package_info->package_name, package_info->package_version,
       package_info->last_backup_android_id, package_info->last_backup_time);
 }
 
-bool ValidateEnableArcPackageSyncPref(Profile* profile) {
-  PrefService* pref_service = profile->GetPrefs();
-  // If device is set to sync everything, Arc package should be synced.
-  if (pref_service->GetBoolean(sync_driver::prefs::kSyncKeepEverythingSynced))
-    return true;
-
-  bool apps_sync_enable = pref_service->GetBoolean(
-      sync_driver::SyncPrefs::GetPrefNameForDataType(syncer::APPS));
-  // ArcPackage sync service is controlled by apps checkbox in sync settings.
-  // Update ArcPackage sync setting pref if it is different from apps sync
-  // setting pref.
-  const char* arc_sync_path =
-      sync_driver::SyncPrefs::GetPrefNameForDataType(syncer::ARC_PACKAGE);
-  if (apps_sync_enable != pref_service->GetBoolean(arc_sync_path)) {
-    pref_service->SetBoolean(arc_sync_path, apps_sync_enable);
-  }
-
-  return apps_sync_enable;
-}
-
 }  // namespace
 
 // ArcPackageSyncableService::SyncItem
 ArcSyncItem::SyncItem(const std::string& package_name,
                       int32_t package_version,
                       int64_t last_backup_android_id,
                       int64_t last_backup_time)
     : package_name(package_name),
       package_version(package_version),
       last_backup_android_id(last_backup_android_id),
@@ skipping 136 matching lines @@
     }
   }
 
   return syncer::SyncError();
 }
 
 bool ArcPackageSyncableService::SyncStarted() {
   if (sync_processor_.get())
     return true;
 
-  sync_driver::SyncService* sync_service =
-      ProfileSyncServiceFactory::GetSyncServiceForBrowserContext(profile_);
-  // ArcPackage sync service is controlled by apps checkbox in sync settings.
-  bool arc_package_sync_should_enable =
-      ValidateEnableArcPackageSyncPref(profile_);
-
-  if (!sync_service || !arc_package_sync_should_enable)
-    return false;
-
-  sync_service->ReenableDatatype(syncer::ARC_PACKAGE);
-
   if (flare_.is_null()) {
     VLOG(2) << this << ": SyncStarted: Flare.";
     flare_ = sync_start_util::GetFlareForSyncableService(profile_->GetPath());
     flare_.Run(syncer::ARC_PACKAGE);
   }
   return false;
 }
 
 // ArcPackageSyncableService private
 void ArcPackageSyncableService::OnPackageRemoved(
@@ skipping 193 matching lines @@
 
 bool ArcPackageSyncableService::ShouldSyncPackage(
     const std::string& package_name) const {
   std::unique_ptr<ArcAppListPrefs::PackageInfo> package(
       prefs_->GetPackage(package_name));
   DCHECK(package.get());
   return package->should_sync;
 }
 
 }  // namespace arc