Misc. small cleanups to minimize TemplateURL refactoring diffs:

chrome/browser/google/google_url_tracker.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
 #define CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_
 #pragma once
 
 #include <string>
 
@@ skipping 36 matching lines @@
   // The constructor does different things depending on which of these values
   // you pass it.  Hopefully these are self-explanatory.
   enum Mode {
     NORMAL_MODE,
     UNIT_TEST_MODE,
   };
 
   // Only the main browser process loop should call this, when setting up
   // g_browser_process->google_url_tracker_.  No code other than the
   // GoogleURLTracker itself should actually use
-  // g_browser_process->google_url_tracker() (which shouldn't be hard, since
-  // there aren't useful public functions on this object for consumers to access
-  // anyway).
+  // g_browser_process->google_url_tracker().
   explicit GoogleURLTracker(Mode mode);
 
   virtual ~GoogleURLTracker();
 
   // Returns the current Google URL.  This will return a valid URL even in
   // unittest mode.
   //
   // This is the only function most code should ever call.
   static GURL GoogleURL();
 
@@ skipping 14 matching lines @@
   // When the load commits, we'll show the infobar.
   static void GoogleURLSearchCommitted();
 
   static const char kDefaultGoogleHomepage[];
   static const char kSearchDomainCheckURL[];
 
  private:
   friend class GoogleURLTrackerInfoBarDelegate;
   friend class GoogleURLTrackerTest;
 
-  typedef InfoBarDelegate* (*InfobarCreator)(InfoBarTabHelper*,
+  typedef InfoBarDelegate* (*InfoBarCreator)(InfoBarTabHelper*,
                                              GoogleURLTracker*,
                                              const GURL&);
 
   void AcceptGoogleURL(const GURL& google_url);
   void CancelGoogleURL(const GURL& google_url);
   void InfoBarClosed();
   void RedoSearch();
 
   // Registers consumer interest in getting an updated URL from the server.
   // It will be notified as chrome::GOOGLE_URL_UPDATED, so the
@@ skipping 20 matching lines @@
   virtual void OnIPAddressChanged() OVERRIDE;
 
   void SearchCommitted();
   void OnNavigationPending(const content::NotificationSource& source,
                            const GURL& pending_url);
   void OnNavigationCommittedOrTabClosed(content::WebContents* web_contents,
                                         int type);
   void ShowGoogleURLInfoBarIfNecessary(content::WebContents* web_contents);
 
   content::NotificationRegistrar registrar_;
-  InfobarCreator infobar_creator_;
+  InfoBarCreator infobar_creator_;
   // TODO(ukai): GoogleURLTracker should track google domain (e.g. google.co.uk)
   // rather than URL (e.g. http://www.google.co.uk/), so that user could
   // configure to use https in search engine templates.
   GURL google_url_;
   GURL fetched_google_url_;
   base::WeakPtrFactory<GoogleURLTracker> weak_ptr_factory_;
   scoped_ptr<content::URLFetcher> fetcher_;
   int fetcher_id_;
   bool in_startup_sleep_;  // True if we're in the five-second "no fetching"
                            // period that begins at browser start.
@@ skipping 40 matching lines @@
   virtual string16 GetMessageText() const OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
 
   // Returns the portion of the appropriate hostname to display.
   string16 GetHost(bool new_host) const;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleURLTrackerInfoBarDelegate);
 };
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_H_