Convert WebContents to return a content::NavigationController instead of the implementation. Upda...

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"
@@ skipping 150 matching lines @@
   explicit WindowedNavigationObserver(content::NavigationController* controller)
       : ui_test_utils::WindowedNotificationObserver(
           T, content::Source<content::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(NavigationController* controller,
+  WindowedLoadStopObserver(content::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);
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<content::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);
 
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<content::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.
   {
@@ skipping 78 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);
 
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<content::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,
@@ skipping 32 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);
 
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<content::NavigationController>(controller));
 
   WindowedLoadStopObserver load_stop_waiter(controller, 1);
   int n_handlers = 0;
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
 
@@ skipping 32 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);
 
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<content::NavigationController>(controller));
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
     auth_needed_waiter.Wait();
@@ skipping 51 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);
 
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<content::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(
@@ skipping 36 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);
 
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::NavigationController* controller =
+      &contents->web_contents()->GetController();
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<content::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
@@ skipping 46 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);
-  NavigationController* controller_1 =
+  content::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);
-  NavigationController* controller_2 =
+  content::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));
 
   {
     // Open different auth urls in each tab.
@@ skipping 34 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);
-  NavigationController* controller_1 =
+  content::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);
-  NavigationController* controller_2 =
+  content::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));
 
   {
     // Open different auth urls in each tab.
@@ skipping 35 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);
-  NavigationController* controller = &contents->web_contents()->GetController();
+  content::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);
-  NavigationController* controller_incognito =
+  content::NavigationController* controller_incognito =
       &contents_incognito->web_contents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<content::NavigationController>(controller));
   LoginPromptBrowserTestObserver observer_incognito;
   observer_incognito.Register(
       content::Source<content::NavigationController>(controller_incognito));
 
   {
     // Open an auth url in each window.
@@ skipping 37 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