Extension syncing: Introduce a NeedsSync pref

chrome/browser/extensions/sync_bundle.cc

 // Copyright 2015 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/extensions/sync_bundle.h"
 
 #include "base/location.h"
 #include "chrome/browser/extensions/extension_sync_data.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
 #include "chrome/browser/extensions/extension_util.h"
@@ skipping 29 matching lines @@
 }
 
 bool SyncBundle::IsSyncing() const {
   return sync_processor_ != nullptr;
 }
 
 bool SyncBundle::HasExtensionId(const std::string& id) const {
   return synced_extensions_.find(id) != synced_extensions_.end();
 }
 
-bool SyncBundle::ShouldIncludeInLocalSyncDataList(
-    const Extension& extension) const {
-  // If there is pending data for this extension, then this version is out of
-  // date. We'll sync back the version we got from sync.
-  return IsSyncing() && !HasPendingExtensionId(extension.id());
-}
-
 void SyncBundle::PushSyncDataList(
     const syncer::SyncDataList& sync_data_list) {
   syncer::SyncChangeList sync_change_list;
   for (const syncer::SyncData& sync_data : sync_data_list) {
     const syncer::SyncDataLocal sync_data_local(sync_data);
     const std::string& extension_id = sync_data_local.GetTag();
 
     sync_change_list.push_back(CreateSyncChange(extension_id, sync_data));
 
     AddSyncedExtension(extension_id);
   }
 
   PushSyncChanges(sync_change_list);
 }
 
 void SyncBundle::PushSyncDeletion(const std::string& extension_id,
                                   const syncer::SyncData& sync_data) {
   RemoveSyncedExtension(extension_id);
   PushSyncChanges(syncer::SyncChangeList(1,
       syncer::SyncChange(FROM_HERE,
                          syncer::SyncChange::ACTION_DELETE,
                          sync_data)));
 }
 
-void SyncBundle::PushSyncChangeIfNeeded(const Extension& extension) {
+void SyncBundle::PushSyncChange(const std::string& extension_id,
+                                const syncer::SyncData& sync_data) {
   syncer::SyncChangeList sync_change_list(
       1,
-      CreateSyncChange(extension.id(),
-                       sync_service_->CreateSyncData(extension).GetSyncData()));
+      CreateSyncChange(extension_id, sync_data));
   PushSyncChanges(sync_change_list);
-  MarkPendingExtensionSynced(extension.id());
+  MarkPendingExtensionSynced(extension_id);
 }
 
 void SyncBundle::ApplySyncChange(const syncer::SyncChange& sync_change) {
   scoped_ptr<ExtensionSyncData> extension_sync_data(
       ExtensionSyncData::CreateFromSyncChange(sync_change));
   if (!extension_sync_data.get())
     return;  // TODO(treib,kalman): Warning message?
 
   if (extension_sync_data->uninstalled())
     RemoveSyncedExtension(extension_sync_data->id());
@@ skipping 42 matching lines @@
 void SyncBundle::RemoveSyncedExtension(const std::string& id) {
   synced_extensions_.erase(id);
 }
 
 void SyncBundle::MarkPendingExtensionSynced(const std::string& id) {
   pending_sync_data_.erase(id);
   AddSyncedExtension(id);
 }
 
 }  // namespace extensions