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

chrome/browser/alternate_nav_url_fetcher.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/alternate_nav_url_fetcher.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/link_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/common/url_fetcher.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "net/base/registry_controlled_domain.h"
 #include "net/url_request/url_request.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+using content::NavigationController;
 using content::OpenURLParams;
 using content::Referrer;
 
 // AlternateNavInfoBarDelegate ------------------------------------------------
 
 class AlternateNavInfoBarDelegate : public LinkInfoBarDelegate {
  public:
   AlternateNavInfoBarDelegate(InfoBarTabHelper* owner,
                               const GURL& alternate_nav_url);
   virtual ~AlternateNavInfoBarDelegate();
@@ skipping 77 matching lines @@
 
 void AlternateNavURLFetcher::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_PENDING: {
       // If we've already received a notification for the same controller, we
       // should delete ourselves as that indicates that the page is being
       // re-loaded so this instance is now stale.
-      content::NavigationController* controller =
-          content::Source<content::NavigationController>(source).ptr();
+      NavigationController* controller =
+          content::Source<NavigationController>(source).ptr();
       if (controller_ == controller) {
         delete this;
       } else if (!controller_) {
         // Start listening for the commit notification.
         DCHECK(controller->GetPendingEntry());
         registrar_.Add(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-                       content::Source<content::NavigationController>(
+                       content::Source<NavigationController>(
                           controller));
         StartFetch(controller);
       }
       break;
     }
 
     case chrome::NOTIFICATION_INSTANT_COMMITTED: {
       // See above.
-      content::NavigationController* controller =
+      NavigationController* controller =
           &content::Source<TabContentsWrapper>(source)->
               web_contents()->GetController();
       if (controller_ == controller) {
         delete this;
       } else if (!controller_) {
         navigated_to_entry_ = true;
         StartFetch(controller);
       }
       break;
     }
 
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED:
       // The page was navigated, we can show the infobar now if necessary.
       registrar_.Remove(this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-                        content::Source<content::NavigationController>(
-                            controller_));
+                        content::Source<NavigationController>(controller_));
       navigated_to_entry_ = true;
       ShowInfobarIfPossible();
       // WARNING: |this| may be deleted!
       break;
 
     case content::NOTIFICATION_TAB_CLOSED:
       // We have been closed. In order to prevent the URLFetcher from trying to
       // access the controller that will be invalid, we delete ourselves.
       // This deletes the URLFetcher and insures its callback won't be called.
       delete this;
       break;
 
     default:
       NOTREACHED();
   }
 }
 
 void AlternateNavURLFetcher::OnURLFetchComplete(
     const content::URLFetcher* source) {
   DCHECK_EQ(fetcher_.get(), source);
   SetStatusFromURLFetch(
       source->GetURL(), source->GetStatus(), source->GetResponseCode());
   ShowInfobarIfPossible();
   // WARNING: |this| may be deleted!
 }
 
-void AlternateNavURLFetcher::StartFetch(
-      content::NavigationController* controller) {
+void AlternateNavURLFetcher::StartFetch(NavigationController* controller) {
   controller_ = controller;
   registrar_.Add(this, content::NOTIFICATION_TAB_CLOSED,
-                 content::Source<content::NavigationController>(controller_));
+                 content::Source<NavigationController>(controller_));
 
   DCHECK_EQ(NOT_STARTED, state_);
   state_ = IN_PROGRESS;
   fetcher_.reset(content::URLFetcher::Create(
       GURL(alternate_nav_url_), content::URLFetcher::HEAD, this));
   fetcher_->SetRequestContext(
       controller_->GetBrowserContext()->GetRequestContext());
   fetcher_->Start();
 }
 
@@ skipping 29 matching lines @@
     return;
   }
 
   InfoBarTabHelper* infobar_helper =
       TabContentsWrapper::GetCurrentWrapperForContents(
           controller_->GetWebContents())->infobar_tab_helper();
   infobar_helper->AddInfoBar(
       new AlternateNavInfoBarDelegate(infobar_helper, alternate_nav_url_));
   delete this;
 }