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

chrome/browser/search_engines/util.h

Index: chrome/browser/search_engines/util.h
diff --git a/chrome/browser/search_engines/util.h b/chrome/browser/search_engines/util.h
index 31b8fb2ab922bf321d701621d5ebb9c57aaad87f..c480f53d7ca30588d0c52ceab07b222db8e3ef8c 100644
--- a/chrome/browser/search_engines/util.h
+++ b/chrome/browser/search_engines/util.h
@@ -7,6 +7,8 @@
 #pragma once
 
 // This file contains utility functions for search engine functionality.
+#include <set>
+#include <string>
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
@@ -31,14 +33,17 @@ string16 GetDefaultSearchEngineName(Profile* profile);
 //    |*new_resource_keyword_version| is set to 0 if no new value. Otherwise,
 //    it is the new value.
 // Only pass in a non-NULL value for service if the WebDataService should be
-// updated.
+// updated. If |removed_keyword_guids| is not NULL, any TemplateURLs removed
+// from the keyword table in the WebDataService will have their Sync GUIDs
+// added to it.
 void GetSearchProvidersUsingKeywordResult(
     const WDTypedResult& result,
     WebDataService* service,
     Profile* profile,
     std::vector<TemplateURL*>* template_urls,
     TemplateURL** default_search_provider,
-    int* new_resource_keyword_version);
+    int* new_resource_keyword_version,
+    std::set<std::string>* removed_keyword_guids);
 
 // Returns true if the default search provider setting has been changed or
 // corrupted. Returns the backup setting in |backup_default_search_provider|.