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

chrome/browser/search_engines/template_url_service.h

 // 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #pragma once
 
 #include <list>
 #include <map>
@@ skipping 336 matching lines @@
                            CreateSyncDataFromTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            CreateTemplateURLFromSyncData);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest, UniquifyKeyword);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            ResolveSyncKeywordConflict);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            FindDuplicateOfSyncTemplateURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
                            MergeSyncAndLocalURLDuplicates);
+  FRIEND_TEST_ALL_PREFIXES(TemplateURLServiceSyncTest,
+                           PreSyncDeletes);
 
   friend class TemplateURLServiceTestUtil;
 
   typedef std::map<string16, TemplateURL*> KeywordToTemplateMap;
   typedef std::map<std::string, TemplateURL*> GUIDToTemplateMap;
   typedef std::list<std::string> PendingExtensionIDs;
 
   // Helper functor for FindMatchingKeywords(), for finding the range of
   // keywords which begin with a prefix.
   class LessWithPrefix;
@@ skipping 254 matching lines @@
   // Sync's error handler. We use it to create a sync error.
   scoped_ptr<SyncErrorFactory> sync_error_factory_;
 
   // Whether or not we are waiting on the default search provider to come in
   // from Sync. This is to facilitate the fact that changes to the value of
   // prefs::kSyncedDefaultSearchProviderGUID do not always come before the
   // TemplateURL entry it refers to, and to handle the case when we want to use
   // 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);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_