Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

chrome/browser/search_engines/search_host_to_urls_map.cc

 // Copyright (c) 2011 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 70 matching lines @@
   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();
          url_set_iterator != urls.end(); ++url_set_iterator) {
       const TemplateURL* t_url = *url_set_iterator;
-      if ((t_url->url() && t_url->url()->HasGoogleBaseURLs()) ||
-          (t_url->suggestions_url() &&
-           t_url->suggestions_url()->HasGoogleBaseURLs())) {
+      if (t_url->url_ref().HasGoogleBaseURLs() ||
+          t_url->suggestions_url_ref().HasGoogleBaseURLs()) {
         t_urls_using_base_url.push_back(t_url);
       }
     }
   }
 
   for (size_t i = 0; i < t_urls_using_base_url.size(); ++i)
     RemoveByPointer(t_urls_using_base_url[i]);
 
   for (size_t i = 0; i < t_urls_using_base_url.size(); ++i)
     Add(t_urls_using_base_url[i], search_terms_data);
@@ skipping 27 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;
     }
   }
 }