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

chrome/browser/search_engines/search_host_to_urls_map.cc

 // 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.
 
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 
@@ skipping 41 matching lines @@
   DCHECK(host_to_urls_map_.find(host) != host_to_urls_map_.end());
 
   TemplateURLSet& urls = host_to_urls_map_[host];
   DCHECK(urls.find(template_url) != urls.end());
 
   urls.erase(urls.find(template_url));
   if (urls.empty())
     host_to_urls_map_.erase(host_to_urls_map_.find(host));
 }
 
-void SearchHostToURLsMap::Update(const TemplateURL* existing_turl,
-                                 const TemplateURL& new_values,
-                                 const SearchTermsData& search_terms_data) {
-  DCHECK(initialized_);
-  DCHECK(existing_turl);
-
-  Remove(existing_turl);
-
-  // Use the information from new_values but preserve existing_turl's id.
-  TemplateURLID previous_id = existing_turl->id();
-  TemplateURL* modifiable_turl = const_cast<TemplateURL*>(existing_turl);
-  *modifiable_turl = new_values;
-  modifiable_turl->set_id(previous_id);
-
-  Add(existing_turl, search_terms_data);
-}
-
 void SearchHostToURLsMap::UpdateGoogleBaseURLs(
     const SearchTermsData& search_terms_data) {
   DCHECK(initialized_);
 
   // Create a list of the the TemplateURLs to update.
   std::vector<const TemplateURL*> t_urls_using_base_url;
   for (HostToURLsMap::iterator host_map_iterator = host_to_urls_map_.begin();
        host_map_iterator != host_to_urls_map_.end(); ++host_map_iterator) {
     const TemplateURLSet& urls = host_map_iterator->second;
     for (TemplateURLSet::const_iterator url_set_iterator = urls.begin();
@@ skipping 41 matching lines @@
     if (url_set_iterator != i->second.end()) {
       i->second.erase(url_set_iterator);
       if (i->second.empty())
         host_to_urls_map_.erase(i);
       // A given TemplateURL only occurs once in the map. As soon as we find the
       // entry, stop.
       return;
     }
   }
 }