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

chrome/browser/instant/instant_loader.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/instant/instant_loader.h"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 34 matching lines @@
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "net/http/http_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 // Number of ms to delay before updating the omnibox bounds. This is only used
 // when the bounds of the omnibox shrinks. If the bounds grows, we update
 // immediately.
 const int kUpdateBoundsDelayMS = 1000;
 
@@ skipping 224 matching lines @@
     : content::WebContentsObserver(loader->preview_contents()->web_contents()),
       loader_(loader),
       registered_render_widget_host_(NULL),
       waiting_for_new_page_(true),
       is_mouse_down_from_activate_(false),
       user_typed_before_load_(false) {
   DCHECK(loader->preview_contents());
   registrar_.Add(this, content::NOTIFICATION_INTERSTITIAL_ATTACHED,
       content::Source<WebContents>(loader->preview_contents()->web_contents()));
   registrar_.Add(this, content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &loader->preview_contents()->web_contents()->GetController()));
 }
 
 void InstantLoader::TabContentsDelegateImpl::PrepareForNewLoad() {
   user_typed_before_load_ = false;
   waiting_for_new_page_ = true;
   add_page_vector_.clear();
   UnregisterForPaintNotifications();
 }
 
@@ skipping 462 matching lines @@
       }
       preview_tab_contents_delegate_->CommitHistory(template_url_id_ != 0);
     }
     if (preview_contents_->web_contents()->GetRenderWidgetHostView()) {
 #if defined(OS_MACOSX)
       preview_contents_->web_contents()->GetRenderWidgetHostView()->
           SetTakesFocusOnlyOnMouseDown(false);
       registrar_.Remove(
           this,
           content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-          content::Source<content::NavigationController>(
+          content::Source<NavigationController>(
               &preview_contents_->web_contents()->GetController()));
 #endif
     }
     preview_contents_->web_contents()->SetDelegate(NULL);
     ready_ = false;
   }
   update_bounds_timer_.Stop();
   AddPreviewUsageForHistogram(template_url_id_,
       type == INSTANT_COMMIT_DESTROY ? PREVIEW_DELETED : PREVIEW_COMMITTED);
   return preview_contents_.release();
@@ skipping 199 matching lines @@
 
   // Cleanup the old preview contents.
   old_tc->constrained_window_tab_helper()->set_delegate(NULL);
   old_tc->core_tab_helper()->set_delegate(NULL);
   old_tc->web_contents()->SetDelegate(NULL);
 
 #if defined(OS_MACOSX)
   registrar_.Remove(
       this,
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &old_tc->web_contents()->GetController()));
 #endif
   registrar_.Remove(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &old_tc->web_contents()->GetController()));
 
   // We prerendered so we should be ready to show. If we're ready, swap in
   // immediately, otherwise show the preview as normal.
   if (ready_)
     delegate_->SwappedTabContents(this);
   else
     ShowPreview();
 }
 
@@ skipping 19 matching lines @@
   // If |preview_contents_| does not currently have a RWHV, we will call
   // SetTakesFocusOnlyOnMouseDown() as a result of the
   // RENDER_VIEW_HOST_CHANGED notification.
   if (preview_contents_->web_contents()->GetRenderWidgetHostView()) {
     preview_contents_->web_contents()->GetRenderWidgetHostView()->
         SetTakesFocusOnlyOnMouseDown(true);
   }
   registrar_.Add(
       this,
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &preview_contents_->web_contents()->GetController()));
 #endif
 
   registrar_.Add(
       this,
       content::NOTIFICATION_NAV_ENTRY_COMMITTED,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &preview_contents_->web_contents()->GetController()));
 
   gfx::Rect tab_bounds;
   tab_contents->web_contents()->GetView()->GetContainerBounds(&tab_bounds);
   preview_contents_->web_contents()->GetView()->SizeContents(tab_bounds.size());
 }
 
 void InstantLoader::CreatePreviewContents(TabContentsWrapper* tab_contents) {
   TabContents* new_contents =
       new TabContents(
@@ skipping 41 matching lines @@
     host->Send(new ChromeViewMsg_SearchBoxResize(
         host->routing_id(), GetOmniboxBoundsInTermsOfPreview()));
   } else {
     host->Send(new ChromeViewMsg_SearchBoxChange(
         host->routing_id(), user_text, verbatim, 0, 0));
   }
 
   frame_load_observer_.reset(new FrameLoadObserver(
       this, preview_contents()->web_contents(), user_text, verbatim));
 }