ExtensionSyncService cleanup: process uninstalls in one step

chrome/browser/extensions/extension_sync_service.cc

 // Copyright 2013 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/extension_sync_service.h"
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/extensions/bookmark_app_helper.h"
@@ skipping 94 matching lines @@
 }
 
 ExtensionSyncService::~ExtensionSyncService() {}
 
 // static
 ExtensionSyncService* ExtensionSyncService::Get(
     content::BrowserContext* context) {
   return ExtensionSyncServiceFactory::GetForBrowserContext(context);
 }
 
-syncer::SyncData ExtensionSyncService::PrepareToSyncUninstallExtension(
-    const Extension& extension) {
-  // Extract the data we need for sync now, but don't actually sync until we've
-  // completed the uninstallation.
+void ExtensionSyncService::SyncUninstallExtension(
+    const extensions::Extension& extension) {
+  if (!extensions::util::ShouldSync(&extension, profile_))
+    return;
+
   // TODO(tim): If we get here and IsSyncing is false, this will cause
   // "back from the dead" style bugs, because sync will add-back the extension
   // that was uninstalled here when MergeDataAndStartSyncing is called.
   // See crbug.com/256795.
   syncer::ModelType type =
       extension.is_app() ? syncer::APPS : syncer::EXTENSIONS;
-  const SyncBundle* bundle = GetSyncBundle(type);
-  if (extensions::util::ShouldSync(&extension, profile_)) {
-    if (bundle->IsSyncing())
-      return CreateSyncData(extension).GetSyncData();
+  SyncBundle* bundle = GetSyncBundle(type);
+  if (!bundle->IsSyncing()) {
     if (extension_service_->is_ready() && !flare_.is_null())
       flare_.Run(type);  // Tell sync to start ASAP.
+    return;
   }
-
-  return syncer::SyncData();
-}
-
-void ExtensionSyncService::ProcessSyncUninstallExtension(
-    const std::string& extension_id,
-    const syncer::SyncData& sync_data) {
-  SyncBundle* bundle = GetSyncBundle(sync_data.GetDataType());
-  if (bundle->HasExtensionId(extension_id))
-    bundle->PushSyncDeletion(extension_id, sync_data);
+  const std::string& id = extension.id();
+  if (bundle->HasExtensionId(id))
+    bundle->PushSyncDeletion(id, CreateSyncData(extension).GetSyncData());
 }
 
 void ExtensionSyncService::SyncEnableExtension(const Extension& extension) {
   // Syncing may not have started yet, so handle pending enables.
   if (extensions::util::ShouldSync(&extension, profile_))
     GetPendingEnables(extension.is_app())->Add(extension.id());
 
   SyncExtensionChangeIfNeeded(extension);
 }
 
 void ExtensionSyncService::SyncDisableExtension(const Extension& extension) {
   // Syncing may not have started yet, so handle pending enables.
   if (extensions::util::ShouldSync(&extension, profile_))
     GetPendingEnables(extension.is_app())->Remove(extension.id());
 
   SyncExtensionChangeIfNeeded(extension);
 }
 
 void ExtensionSyncService::SyncExtensionChangeIfNeeded(
     const Extension& extension) {
   if (!extensions::util::ShouldSync(&extension, profile_))
     return;
 
   syncer::ModelType type =
       extension.is_app() ? syncer::APPS : syncer::EXTENSIONS;
   SyncBundle* bundle = GetSyncBundle(type);
   if (bundle->IsSyncing())
-    bundle->PushSyncChangeIfNeeded(extension);
+    bundle->PushSyncAddOrUpdate(extension);
   else if (extension_service_->is_ready() && !flare_.is_null())
     flare_.Run(type);
 }
 
 syncer::SyncMergeResult ExtensionSyncService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
     scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) {
   CHECK(sync_processor.get());
@@ skipping 340 matching lines @@
       // non-INTERNAL location.  Add to pending_sync_data, even though it will
       // never be removed (we'll never install a syncable version of the
       // extension), so that GetAllSyncData() continues to send it.
     }
     // Track pending extensions so that we can return them in GetAllSyncData().
     return false;
   }
 
   return true;
 }