Ensure that TemplateURLs removed by prepopulate search engine merging is also removed from Sync.

chrome/browser/search_engines/template_url_service.cc

 // Copyright (c) 2012 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/search_engines/template_url_service.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/environment.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 573 matching lines @@
 
   // initial_default_search_provider_ is only needed before we've finished
   // loading. Now that we've loaded we can nuke it.
   initial_default_search_provider_.reset();
   is_default_search_managed_ = false;
 
   TemplateURLVector template_urls;
   TemplateURL* default_search_provider = NULL;
   int new_resource_keyword_version = 0;
   GetSearchProvidersUsingKeywordResult(*result, service_.get(), profile_,
-      &template_urls, &default_search_provider, &new_resource_keyword_version);
+      &template_urls, &default_search_provider, &new_resource_keyword_version,
+      &pre_sync_deletes_);
 
   bool database_specified_a_default = (default_search_provider != NULL);
 
   // Check if default search provider is now managed.
   scoped_ptr<TemplateURL> default_from_prefs;
   LoadDefaultSearchProviderFromPrefs(&default_from_prefs,
                                      &is_default_search_managed_);
 
   // Check if the default search provider has been changed in Web Data by
   // another program. No immediate action is performed because the default
@@ skipping 346 matching lines @@
 
   for (SyncDataMap::const_iterator iter = sync_data_map.begin();
       iter != sync_data_map.end(); ++iter) {
     TemplateURL* local_turl = GetTemplateURLForGUID(iter->first);
     scoped_ptr<TemplateURL> sync_turl(
         CreateTemplateURLFromTemplateURLAndSyncData(profile_, local_turl,
             iter->second, &new_changes));
     if (!sync_turl.get())
       continue;
 
+    if (pre_sync_deletes_.find(sync_turl->sync_guid()) !=
+        pre_sync_deletes_.end()) {
+      // This entry was deleted before the initial sync began (possibly through
+      // preprocessing in TemplateURLService's loading code). Ignore it and send
+      // an ACTION_DELETE up to the server.
+      new_changes.push_back(SyncChange(SyncChange::ACTION_DELETE,
+                                       iter->second));
+      continue;
+    }
+
     if (local_turl) {
       // This local search engine is already synced. If the timestamp differs
       // from Sync, we need to update locally or to the cloud. Note that if the
       // timestamps are equal, we touch neither.
       if (sync_turl->last_modified() > local_turl->last_modified()) {
         // We've received an update from Sync. We should replace all synced
         // fields in the local TemplateURL. Note that this includes the
         // TemplateURLID and the TemplateURL may have to be reparsed. This
         // also makes the local data's last_modified timestamp equal to Sync's,
         // avoiding an Update on the next MergeData call.
@@ skipping 47 matching lines @@
       iter != local_data_map.end(); ++iter) {
     new_changes.push_back(SyncChange(SyncChange::ACTION_ADD, iter->second));
   }
 
   PreventDuplicateGUIDUpdates(&new_changes);
 
   SyncError error = sync_processor_->ProcessSyncChanges(FROM_HERE, new_changes);
   if (error.IsSet())
     return error;
 
+  // The ACTION_DELETEs from this set are processed. Empty it so we don't try to
+  // reuse them on the next call to MergeDataAndStartSyncing.
+  pre_sync_deletes_.clear();
+
   models_associated_ = true;
   return SyncError();
 }
 
 void TemplateURLService::StopSyncing(syncable::ModelType type) {
   DCHECK_EQ(type, syncable::SEARCH_ENGINES);
   models_associated_ = false;
   sync_processor_.reset();
   sync_error_factory_.reset();
 }
@@ skipping 1165 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = guid::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }
+
+void TemplateURLService::AddPreSyncDeletedGUIDForTesting(
+    const std::string& guid) {
+  pre_sync_deletes_.insert(guid);

[Peter Kasting, 2012/05/15 21:28:10]

Why not just do this directly in the test?  It has access to do so anyway.

[SteveT, 2012/05/16 13:26:43]

True. Removed this method.

+}