Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 21 matching lines @@
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::NavigationController;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace {
 
-InfoBarDelegate* CreateInfobar(InfoBarTabHelper* infobar_helper,
+InfoBarDelegate* CreateInfoBar(InfoBarTabHelper* infobar_helper,
                                GoogleURLTracker* google_url_tracker,
                                const GURL& new_google_url) {
   InfoBarDelegate* infobar = new GoogleURLTrackerInfoBarDelegate(infobar_helper,
       google_url_tracker, new_google_url);
   infobar_helper->AddInfoBar(infobar);
   return infobar;
 }
 
 }  // namespace
 
@@ skipping 59 matching lines @@
 
 
 // GoogleURLTracker -----------------------------------------------------------
 
 const char GoogleURLTracker::kDefaultGoogleHomepage[] =
     "http://www.google.com/";
 const char GoogleURLTracker::kSearchDomainCheckURL[] =
     "https://www.google.com/searchdomaincheck?format=domain&type=chrome";
 
 GoogleURLTracker::GoogleURLTracker(Mode mode)
-    : infobar_creator_(&CreateInfobar),
+    : infobar_creator_(&CreateInfoBar),
       google_url_(mode == UNIT_TEST_MODE ? kDefaultGoogleHomepage :
           g_browser_process->local_state()->GetString(
               prefs::kLastKnownGoogleURL)),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)),
       fetcher_id_(0),
       in_startup_sleep_(true),
       already_fetched_(false),
       need_to_fetch_(false),
       need_to_prompt_(false),
       controller_(NULL),
@@ skipping 45 matching lines @@
 
 // static
 void GoogleURLTracker::GoogleURLSearchCommitted() {
   GoogleURLTracker* tracker = g_browser_process->google_url_tracker();
   if (tracker)
     tracker->SearchCommitted();
 }
 
 void GoogleURLTracker::AcceptGoogleURL(const GURL& new_google_url) {
   google_url_ = new_google_url;
-  g_browser_process->local_state()->SetString(prefs::kLastKnownGoogleURL,
-                                              google_url_.spec());
-  g_browser_process->local_state()->SetString(prefs::kLastPromptedGoogleURL,
-                                              google_url_.spec());
+  PrefService* prefs = g_browser_process->local_state();
+  prefs->SetString(prefs::kLastKnownGoogleURL, google_url_.spec());
+  prefs->SetString(prefs::kLastPromptedGoogleURL, google_url_.spec());
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
       content::NotificationService::AllSources(),
       content::NotificationService::NoDetails());
   need_to_prompt_ = false;
 }
 
 void GoogleURLTracker::CancelGoogleURL(const GURL& new_google_url) {
   g_browser_process->local_state()->SetString(prefs::kLastPromptedGoogleURL,
                                               new_google_url.spec());
@@ skipping 146 matching lines @@
         content::NotificationService::AllBrowserContextsAndSources());
   }
 }
 
 void GoogleURLTracker::OnNavigationPending(
     const content::NotificationSource& source,
     const GURL& pending_url) {
   controller_ = content::Source<NavigationController>(source).ptr();
   search_url_ = pending_url;
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
-                    content::NotificationService::AllSources());
+      content::NotificationService::AllBrowserContextsAndSources());
   // Start listening for the commit notification. We also need to listen for the
   // tab close command since that means the load will never commit.
   registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
                  content::Source<NavigationController>(controller_));
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
                  content::Source<NavigationController>(controller_));
 }
 
 void GoogleURLTracker::OnNavigationCommittedOrTabClosed(
     WebContents* web_contents,
@@ skipping 16 matching lines @@
 
   // |tab_contents| can be NULL during tests.
   InfoBarTabHelper* infobar_helper = NULL;
   if (web_contents) {
     TabContentsWrapper* wrapper =
         TabContentsWrapper::GetCurrentWrapperForContents(web_contents);
     infobar_helper = wrapper->infobar_tab_helper();
   }
   infobar_ = (*infobar_creator_)(infobar_helper, this, fetched_google_url_);
 }