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

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index 39519b3580847a180ae50aabf068c0ad8ebdfb62..96338c600330250b1548dd87e8a2a087e50aeee2 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -354,6 +354,8 @@ class TemplateURLService : public WebDataServiceConsumer,
                            FindDuplicateOfSyncTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            MergeSyncAndLocalURLDuplicates);
+  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
+                           PreSyncDeletes);
 
   friend class TemplateURLServiceTestUtil;
 
@@ -628,6 +630,12 @@ class TemplateURLService : public WebDataServiceConsumer,
   // the Synced default when the default search provider becomes unmanaged.
   bool pending_synced_default_search_;
 
+  // A set of sync GUIDs denoting TemplateURLs that have been removed from this
+  // model or the underlying WebDataService prior to MergeDataAndStartSyncing.
+  // This set is used to determine what entries from the server we want to
+  // ignore locally and return a delete command for.
+  std::set<std::string> pre_sync_deletes_;
+
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };