More misc. cleanups to minimize future refactoring diffs.

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 47 matching lines @@
   if (urls.empty())
     host_to_urls_map_.erase(host_to_urls_map_.find(host));
 }
 
 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();
-         url_set_iterator != urls.end(); ++url_set_iterator) {
-      const TemplateURL* t_url = *url_set_iterator;
-      if (t_url->url_ref().HasGoogleBaseURLs() ||
-          t_url->suggestions_url_ref().HasGoogleBaseURLs()) {
-        t_urls_using_base_url.push_back(t_url);
-      }
+  for (HostToURLsMap::iterator i(host_to_urls_map_.begin());
+       i != host_to_urls_map_.end(); ++i) {
+    for (TemplateURLSet::const_iterator j(i->second.begin());
+         j != i->second.end(); ++j) {
+      if ((*j)->url_ref().HasGoogleBaseURLs() ||
+          (*j)->suggestions_url_ref().HasGoogleBaseURLs())
+        t_urls_using_base_url.push_back(*j);
     }
   }
 
   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 25 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;
     }
   }
 }