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

content/browser/tab_contents/render_view_host_manager_unittest.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 "content/browser/browser_thread_impl.h"
 #include "content/browser/browser_url_handler.h"
 #include "content/browser/mock_content_browser_client.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
 #include "content/browser/site_instance.h"
 #include "content/browser/tab_contents/navigation_controller_impl.h"
 #include "content/browser/tab_contents/navigation_entry_impl.h"
 #include "content/browser/tab_contents/render_view_host_manager.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/browser/webui/empty_web_ui_factory.h"
 #include "content/common/test_url_constants.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/url_constants.h"
 #include "content/test/test_browser_context.h"
 #include "content/test/test_notification_tracker.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/url_util.h"
 #include "webkit/glue/webkit_glue.h"
 
 using content::BrowserThread;
 using content::BrowserThreadImpl;
+using content::NavigationController;
 using content::NavigationEntry;
 using content::NavigationEntryImpl;
 
 namespace {
 
 const char kChromeUISchemeButNotWebUIURL[] = "chrome://not-webui";
 
 class RenderViewHostManagerTestWebUIFactory
     : public content::EmptyWebUIFactory {
  public:
@@ skipping 247 matching lines @@
 // Tests the Navigate function. We navigate three sites consecutively and check
 // how the pending/committed RenderViewHost are modified.
 TEST_F(RenderViewHostManagerTest, Navigate) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
 
   TestTabContents tab_contents(browser_context(), instance);
   notifications.ListenFor(
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &tab_contents.GetController()));
 
   // Create.
   RenderViewHostManager manager(&tab_contents, &tab_contents);
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE);
 
   RenderViewHost* host;
 
   // 1) The first navigation. --------------------------
@@ skipping 68 matching lines @@
 // has been committed. This is also a regression test for
 // http://crbug.com/104600.
 TEST_F(RenderViewHostManagerTest, NavigateWithEarlyReNavigation) {
   TestNotificationTracker notifications;
 
   SiteInstance* instance = SiteInstance::CreateSiteInstance(browser_context());
 
   TestTabContents tab_contents(browser_context(), instance);
   notifications.ListenFor(
       content::NOTIFICATION_RENDER_VIEW_HOST_CHANGED,
-      content::Source<content::NavigationController>(
+      content::Source<NavigationController>(
           &tab_contents.GetController()));
 
   // Create.
   RenderViewHostManager manager(&tab_contents, &tab_contents);
 
   manager.Init(browser_context(), instance, MSG_ROUTING_NONE);
 
   // 1) The first navigation. --------------------------
   const GURL kUrl1("http://www.google.com/");
   NavigationEntryImpl entry1(NULL /* instance */, -1 /* page_id */, kUrl1,
@@ skipping 214 matching lines @@
   // current one.
   EXPECT_TRUE(contents()->GetRenderManagerForTesting()->
       pending_render_view_host() == NULL);
   EXPECT_EQ(evil_rvh, contents()->GetRenderManagerForTesting()->current_host());
 
   // Also we should not have a pending navigation entry.
   NavigationEntry* entry = contents()->GetController().GetActiveEntry();
   ASSERT_TRUE(entry != NULL);
   EXPECT_EQ(kUrl2, entry->GetURL());
 }