Get rid of content::NavigationController in cc file and use "using" instead.

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 14 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_fetcher.h"
 #include "grit/generated_resources.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context_getter.h"
 #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,
                                GoogleURLTracker* google_url_tracker,
                                const GURL& new_google_url) {
   InfoBarDelegate* infobar = new GoogleURLTrackerInfoBarDelegate(infobar_helper,
@@ skipping 271 matching lines @@
                          content::PAGE_TRANSITION_GENERATED, false);
     controller_->GetWebContents()->OpenURL(params);
   }
 }
 
 void GoogleURLTracker::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
-      content::NavigationController* controller =
-          content::Source<content::NavigationController>(source).ptr();
+      NavigationController* controller =
+          content::Source<NavigationController>(source).ptr();
       OnNavigationPending(source, controller->GetPendingEntry()->GetURL());
       break;
     }
 
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
     case content::NOTIFICATION_TAB_CLOSED:
       OnNavigationCommittedOrTabClosed(
-          content::Source<content::NavigationController>(source).ptr()->
+          content::Source<NavigationController>(source).ptr()->
               GetWebContents(), type);
       break;
 
     default:
       NOTREACHED() << "Unknown notification received:" << type;
   }
 }
 
 void GoogleURLTracker::OnIPAddressChanged() {
   already_fetched_ = false;
   StartFetchIfDesirable();
 }
 
 void GoogleURLTracker::SearchCommitted() {
   if (registrar_.IsEmpty() && (need_to_prompt_ || fetcher_.get())) {
     // This notification will fire a bit later in the same call chain we're
     // currently in.
     registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                    content::NotificationService::AllSources());
   }
 }
 
 void GoogleURLTracker::OnNavigationPending(
     const content::NotificationSource& source,
     const GURL& pending_url) {
-  controller_ = content::Source<content::NavigationController>(source).ptr();
+  controller_ = content::Source<NavigationController>(source).ptr();
   search_url_ = pending_url;
   registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_PENDING,
                     content::NotificationService::AllSources());
   // 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<content::NavigationController>(controller_));
+                 content::Source<NavigationController>(controller_));
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
-                 content::Source<content::NavigationController>(controller_));
+                 content::Source<NavigationController>(controller_));
 }
 
 void GoogleURLTracker::OnNavigationCommittedOrTabClosed(
     WebContents* web_contents,
     int type) {
   registrar_.RemoveAll();
 
   if (type == content::NOTIFICATION_NAV_ENTRY_COMMITTED) {
     ShowGoogleURLInfoBarIfNecessary(web_contents);
   } else {
@@ skipping 10 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_);
 }