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

 // Copyright (c) 2010 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_SEARCH_HOST_TO_URLS_MAP_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 20 matching lines @@
             const SearchTermsData& search_terms_data);
 
   // Adds a new TemplateURL to the map. Since |template_url| is owned
   // externally, Remove or RemoveAll should be called if it becomes invalid.
   void Add(const TemplateURL* template_url,
            const SearchTermsData& search_terms_data);
 
   // 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);
 
   // Returns the first TemplateURL found with a URL using the specified |host|,
   // or NULL if there are no such TemplateURLs
   const TemplateURL* GetTemplateURLForHost(const std::string& host) const;
 
   // Return the TemplateURLSet for the given the |host| or NULL if there are
   // none.
   const TemplateURLSet* GetURLsForHost(const std::string& host) const;
@@ skipping 14 matching lines @@
   // The security origin for the default search provider.
   std::string default_search_origin_;
 
   // Has Init been called?
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchHostToURLsMap);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_SEARCH_HOST_TO_URLS_MAP_H_