Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

chrome/browser/search_engines/search_host_to_urls_map.h

Index: chrome/browser/search_engines/search_host_to_urls_map.h
===================================================================
--- chrome/browser/search_engines/search_host_to_urls_map.h	(revision 131175)
+++ chrome/browser/search_engines/search_host_to_urls_map.h	(working copy)
@@ -38,13 +38,6 @@
   // Removes the TemplateURL from the lookup.
   void Remove(const TemplateURL* template_url);
 
-  // Updates information in an existing TemplateURL. Note: Using Remove and
-  // then Add separately would lead to race conditions in reading because the
-  // lock would be released inbetween the calls.
-  void Update(const TemplateURL* existing_turl,
-              const TemplateURL& new_values,
-              const SearchTermsData& search_terms_data);
-
   // Updates all search providers which have a google base url.
   void UpdateGoogleBaseURLs(const SearchTermsData& search_terms_data);