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

chrome/browser/ui/login/login_prompt_browsertest.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 <algorithm>
 #include <list>
 #include <map>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/test/test_browser_thread.h"
 #include "net/base/auth.h"
 #include "net/base/mock_host_resolver.h"
 
+using content::NavigationController;
 using content::OpenURLParams;
 using content::Referrer;
 
 namespace {
 
 class LoginPromptBrowserTest : public InProcessBrowserTest {
  public:
   LoginPromptBrowserTest()
       : bad_password_("incorrect"), bad_username_("nouser") {
     set_show_window(true);
@@ skipping 116 matching lines @@
     const content::NotificationSource& source) {
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_NEEDED, source);
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_SUPPLIED, source);
   registrar_.Add(this, chrome::NOTIFICATION_AUTH_CANCELLED, source);
 }
 
 template <int T>
 class WindowedNavigationObserver
     : public ui_test_utils::WindowedNotificationObserver {
  public:
-  explicit WindowedNavigationObserver(content::NavigationController* controller)
+  explicit WindowedNavigationObserver(NavigationController* controller)
       : ui_test_utils::WindowedNotificationObserver(
-          T, content::Source<content::NavigationController>(controller)) {}
+          T, content::Source<NavigationController>(controller)) {}
 };
 
 // LOAD_STOP observer is special since we want to be able to wait for
 // multiple LOAD_STOP events.
 class WindowedLoadStopObserver
     : public WindowedNavigationObserver<content::NOTIFICATION_LOAD_STOP> {
  public:
-  WindowedLoadStopObserver(content::NavigationController* controller,
+  WindowedLoadStopObserver(NavigationController* controller,
                            int notification_count)
       : WindowedNavigationObserver<content::NOTIFICATION_LOAD_STOP>(controller),
         remaining_notification_count_(notification_count) {}
  protected:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
  private:
   int remaining_notification_count_;  // Number of notifications remaining.
 };
@@ skipping 55 matching lines @@
       prerender::PrerenderManager::SetMode(old_mode_);
     }
    private:
     bool old_prefetch_state_;
     prerender::PrerenderManager::PrerenderManagerMode old_mode_;
   } set_prefetch_for_test(true);
 
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   WindowedLoadStopObserver load_stop_waiter(controller, 1);
   browser()->OpenURL(OpenURLParams(
       test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
       false));
 
   load_stop_waiter.Wait();
   EXPECT_TRUE(observer.handlers_.empty());
   EXPECT_TRUE(test_server()->Stop());
 }
 
 // Test login prompt cancellation.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) {
   ASSERT_TRUE(test_server()->Start());
   GURL auth_page = test_server()->GetURL(kAuthBasicPage);
   GURL no_auth_page_1 = test_server()->GetURL("a");
   GURL no_auth_page_2 = test_server()->GetURL("b");
   GURL no_auth_page_3 = test_server()->GetURL("c");
 
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
 
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   // First navigate to an unauthenticated page so we have something to
   // go back to.
   ui_test_utils::NavigateToURL(browser(), no_auth_page_1);
 
   // Navigating while auth is requested is the same as cancelling.
   {
     // We need to wait for two LOAD_STOP events.  One for auth_page and one for
     // no_auth_page_2.
     WindowedLoadStopObserver load_stop_waiter(controller, 2);
@@ skipping 75 matching lines @@
 // displaying the page.  First we check whether cancelling works as
 // expected.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmCancellation) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_page = test_server()->GetURL(kMultiRealmTestPage);
 
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
 
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   WindowedLoadStopObserver load_stop_waiter(controller, 1);
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
     auth_needed_waiter.Wait();
   }
@@ skipping 29 matching lines @@
 // Similar to the MultipleRealmCancellation test above, but tests
 // whether supplying credentials work as exepcted.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_page = test_server()->GetURL(kMultiRealmTestPage);
 
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
 
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   WindowedLoadStopObserver load_stop_waiter(controller, 1);
   int n_handlers = 0;
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
 
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
@@ skipping 29 matching lines @@
 // Testing for recovery from an incorrect password for the case where
 // there are multiple authenticated resources.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, IncorrectConfirmation) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_page = test_server()->GetURL(kSingleRealmTestPage);
 
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
 
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
     auth_needed_waiter.Wait();
   }
 
   EXPECT_FALSE(observer.handlers_.empty());
@@ skipping 48 matching lines @@
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, NoLoginPromptForFavicon) {
   const char* kFaviconTestPage = "files/login/has_favicon.html";
   const char* kFaviconResource = "auth-basic/favicon.gif";
 
   ASSERT_TRUE(test_server()->Start());
 
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
 
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   // First load a page that has a favicon that requires
   // authentication.  There should be no login prompt.
   {
     GURL test_page = test_server()->GetURL(kFaviconTestPage);
     WindowedLoadStopObserver load_stop_waiter(controller, 1);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
     load_stop_waiter.Wait();
@@ skipping 33 matching lines @@
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, BlockCrossdomainPrompt) {
   const char* kTestPage = "files/login/load_img_from_b.html";
 
   host_resolver()->AddRule("www.a.com", "127.0.0.1");
   host_resolver()->AddRule("www.b.com", "127.0.0.1");
   ASSERT_TRUE(test_server()->Start());
 
   TabContentsWrapper* contents = browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
 
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
 
   // Load a page that has a cross-domain sub-resource authentication.
   // There should be no login prompt.
   {
     GURL test_page = test_server()->GetURL(kTestPage);
     ASSERT_EQ("127.0.0.1", test_page.host());
 
     // Change the host from 127.0.0.1 to www.a.com so that when the
     // page tries to load from b, it will be cross-origin.
     std::string new_host("www.a.com");
@@ skipping 44 matching lines @@
   EXPECT_TRUE(test_server()->Stop());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
   ASSERT_TRUE(test_server()->Start());
 
   // Get NavigationController for tab 1.
   TabContentsWrapper* contents_1 =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents_1);
-  content::NavigationController* controller_1 =
+  NavigationController* controller_1 =
       &contents_1->web_contents()->GetController();
 
   // Open a new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("about:blank"),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   // Get NavigationController for tab 2.
   TabContentsWrapper* contents_2 =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents_2);
   ASSERT_NE(contents_1, contents_2);
-  content::NavigationController* controller_2 =
+  NavigationController* controller_2 =
       &contents_2->web_contents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
-  observer.Register(content::Source<content::NavigationController>(
-      controller_1));
-  observer.Register(content::Source<content::NavigationController>(
-      controller_2));
+  observer.Register(content::Source<NavigationController>(controller_1));
+  observer.Register(content::Source<NavigationController>(controller_2));
 
   {
     // Open different auth urls in each tab.
     WindowedAuthNeededObserver auth_needed_waiter_1(controller_1);
     WindowedAuthNeededObserver auth_needed_waiter_2(controller_2);
     contents_1->tab_contents()->OpenURL(OpenURLParams(
         test_server()->GetURL("auth-basic/1"),
         content::Referrer(),
         CURRENT_TAB,
         content::PAGE_TRANSITION_TYPED,
@@ skipping 27 matching lines @@
   EXPECT_TRUE(test_server()->Stop());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
   ASSERT_TRUE(test_server()->Start());
 
   // Get NavigationController for tab 1.
   TabContentsWrapper* contents_1 =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents_1);
-  content::NavigationController* controller_1 =
+  NavigationController* controller_1 =
       &contents_1->web_contents()->GetController();
 
   // Open a new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("about:blank"),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
   // Get NavigationController for tab 2.
   TabContentsWrapper* contents_2 =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents_2);
   ASSERT_NE(contents_1, contents_2);
-  content::NavigationController* controller_2 =
+  NavigationController* controller_2 =
       &contents_2->web_contents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
-  observer.Register(content::Source<content::NavigationController>(
-      controller_1));
-  observer.Register(content::Source<content::NavigationController>(
-      controller_2));
+  observer.Register(content::Source<NavigationController>(controller_1));
+  observer.Register(content::Source<NavigationController>(controller_2));
 
   {
     // Open different auth urls in each tab.
     WindowedAuthNeededObserver auth_needed_waiter_1(controller_1);
     WindowedAuthNeededObserver auth_needed_waiter_2(controller_2);
     contents_1->tab_contents()->OpenURL(OpenURLParams(
         test_server()->GetURL("auth-basic/1"),
         content::Referrer(),
         CURRENT_TAB,
         content::PAGE_TRANSITION_TYPED,
@@ skipping 28 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
                        SupplyRedundantAuthsMultiProfile) {
   ASSERT_TRUE(test_server()->Start());
 
   // Get NavigationController for regular tab.
   TabContentsWrapper* contents =
       browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents);
-  content::NavigationController* controller =
-      &contents->web_contents()->GetController();
+  NavigationController* controller = &contents->web_contents()->GetController();
 
   // Open an incognito window.
   Browser* browser_incognito = CreateIncognitoBrowser();
 
   // Get NavigationController for incognito tab.
   TabContentsWrapper* contents_incognito =
       browser_incognito->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(contents_incognito);
   ASSERT_NE(contents, contents_incognito);
-  content::NavigationController* controller_incognito =
+  NavigationController* controller_incognito =
       &contents_incognito->web_contents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
-  observer.Register(content::Source<content::NavigationController>(controller));
+  observer.Register(content::Source<NavigationController>(controller));
   LoginPromptBrowserTestObserver observer_incognito;
   observer_incognito.Register(
-      content::Source<content::NavigationController>(controller_incognito));
+      content::Source<NavigationController>(controller_incognito));
 
   {
     // Open an auth url in each window.
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     WindowedAuthNeededObserver auth_needed_waiter_incognito(
         controller_incognito);
     contents->tab_contents()->OpenURL(OpenURLParams(
         test_server()->GetURL("auth-basic/1"),
         content::Referrer(),
         CURRENT_TAB,
@@ skipping 30 matching lines @@
   EXPECT_EQ(1, observer.auth_needed_count_);
   EXPECT_EQ(1, observer.auth_supplied_count_);
   EXPECT_EQ(0, observer.auth_cancelled_count_);
   EXPECT_EQ(1, observer_incognito.auth_needed_count_);
   EXPECT_EQ(0, observer_incognito.auth_supplied_count_);
   EXPECT_EQ(0, observer_incognito.auth_cancelled_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 }  // namespace