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

chrome/browser/infobars/infobar_tab_helper.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/infobars/infobar_tab_helper.h"
 
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_delegate.h"
 #include "chrome/browser/tab_contents/insecure_content_infobar_delegate.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 
+using content::NavigationController;
 using content::WebContents;
 
 InfoBarTabHelper::InfoBarTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       infobars_enabled_(true) {
   DCHECK(web_contents);
 }
 
 InfoBarTabHelper::~InfoBarTabHelper() {
   // Destroy all remaining InfoBars.  It's important to not animate here so that
@@ skipping 25 matching lines @@
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
       content::Source<InfoBarTabHelper>(this),
       content::Details<InfoBarAddedDetails>(delegate));
 
   // Add ourselves as an observer for navigations the first time a delegate is
   // added. We use this notification to expire InfoBars that need to expire on
   // page transitions.
   if (infobars_.size() == 1) {
     registrar_.Add(
         this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<content::NavigationController>(
+        content::Source<NavigationController>(
             &web_contents()->GetController()));
   }
 }
 
 void InfoBarTabHelper::RemoveInfoBar(InfoBarDelegate* delegate) {
   RemoveInfoBarInternal(delegate, true);
 }
 
 void InfoBarTabHelper::ReplaceInfoBar(InfoBarDelegate* old_delegate,
                                       InfoBarDelegate* new_delegate) {
@@ skipping 45 matching lines @@
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::Source<InfoBarTabHelper>(this),
       content::Details<InfoBarRemovedDetails>(&removed_details));
 
   infobars_.erase(infobars_.begin() + i);
   // Remove ourselves as an observer if we are tracking no more InfoBars.
   if (infobars_.empty()) {
     registrar_.Remove(
         this, content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-        content::Source<content::NavigationController>(
+        content::Source<NavigationController>(
             &web_contents()->GetController()));
   }
 }
 
 void InfoBarTabHelper::RemoveAllInfoBars(bool animate) {
   while (!infobars_.empty())
     RemoveInfoBarInternal(GetInfoBarDelegateAt(infobar_count() - 1), animate);
 }
 
 void InfoBarTabHelper::OnDidBlockDisplayingInsecureContent() {
@@ skipping 38 matching lines @@
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void InfoBarTabHelper::Observe(int type,
                                const content::NotificationSource& source,
                                const content::NotificationDetails& details) {
   switch (type) {
     case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
       DCHECK(&web_contents()->GetController() ==
-             content::Source<content::NavigationController>(source).ptr());
+             content::Source<NavigationController>(source).ptr());
 
       content::LoadCommittedDetails& committed_details =
           *(content::Details<content::LoadCommittedDetails>(details).ptr());
 
       // NOTE: It is not safe to change the following code to count upwards or
       // use iterators, as the RemoveInfoBar() call synchronously modifies our
       // delegate list.
       for (size_t i = infobars_.size(); i > 0; --i) {
         InfoBarDelegate* delegate = GetInfoBarDelegateAt(i - 1);
         if (delegate->ShouldExpire(committed_details))
           RemoveInfoBar(delegate);
       }
 
       break;
     }
     default:
       NOTREACHED();
   }
 }