Move tab functions off Browser into browser_tabstrip and browser_tabrestore.

chrome/browser/ui/login/login_prompt_browsertest.cc

 // Copyright (c) 2012 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/browser_commands.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/login/login_prompt.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.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/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/auth.h"
@@ skipping 224 matching lines @@
 
     ~SetPrefetchForTest() {
       prerender::PrerenderManager::SetIsPrefetchEnabled(old_prefetch_state_);
       prerender::PrerenderManager::SetMode(old_mode_);
     }
    private:
     bool old_prefetch_state_;
     prerender::PrerenderManager::PrerenderManagerMode old_mode_;
   } set_prefetch_for_test(true);
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   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 that "Basic" HTTP authentication works.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestBasicAuth) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_page = test_server()->GetURL(kAuthBasicPage);
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<NavigationController>(controller));
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
@@ skipping 26 matching lines @@
       ExpectedTitleFromAuth(ASCIIToUTF16("basicuser"), ASCIIToUTF16("secret"));
   ui_test_utils::TitleWatcher title_watcher(contents, expected_title);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 // Test that "Digest" HTTP authentication works.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) {
   ASSERT_TRUE(test_server()->Start());
   GURL test_page = test_server()->GetURL(kAuthDigestPage);
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<NavigationController>(controller));
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
@@ skipping 26 matching lines @@
   auth_supplied_waiter.Wait();
 
   string16 expected_title = ExpectedTitleFromAuth(username, password);
   ui_test_utils::TitleWatcher title_watcher(contents, expected_title);
   EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) {
   ASSERT_TRUE(test_server()->Start());
 
-  content::WebContents* contents1 = browser()->GetActiveWebContents();
+  content::WebContents* contents1 = chrome::GetActiveWebContents(browser());
   NavigationController* controller1 = &contents1->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<NavigationController>(controller1));
 
   // Open a new tab.
   ui_test_utils::NavigateToURLWithDisposition(
       browser(),
       GURL("about:blank"),
       NEW_FOREGROUND_TAB,
       ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
 
-  content::WebContents* contents2 = browser()->GetActiveWebContents();
+  content::WebContents* contents2 = chrome::GetActiveWebContents(browser());
   ASSERT_NE(contents1, contents2);
   NavigationController* controller2 = &contents2->GetController();
   observer.Register(content::Source<NavigationController>(controller2));
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller1);
     contents1->OpenURL(OpenURLParams(
         test_server()->GetURL(kAuthBasicPage), Referrer(),
         CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
     auth_needed_waiter.Wait();
@@ skipping 27 matching lines @@
 }
 
 // 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");
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
 
   LoginPromptBrowserTestObserver observer;
   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.
@@ skipping 75 matching lines @@
 
 // Test handling of resources that require authentication even though
 // the page they are included on doesn't.  In this case we should only
 // present the minimal number of prompts necessary for successfully
 // 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);
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<NavigationController>(controller));
 
   WindowedLoadStopObserver load_stop_waiter(controller, 1);
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
@@ skipping 29 matching lines @@
   EXPECT_LT(0, observer.auth_cancelled_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 // 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);
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<NavigationController>(controller));
 
   WindowedLoadStopObserver load_stop_waiter(controller, 1);
   int n_handlers = 0;
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
@@ skipping 29 matching lines @@
   EXPECT_EQ(0, observer.auth_cancelled_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 // 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);
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   observer.Register(content::Source<NavigationController>(controller));
 
   {
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(
         test_page, Referrer(), CURRENT_TAB, content::PAGE_TRANSITION_TYPED,
         false));
@@ skipping 48 matching lines @@
 
 // If the favicon is an authenticated resource, we shouldn't prompt
 // for credentials.  The same URL, if requested elsewhere should
 // prompt for credentials.
 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());
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
 
   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);
@@ skipping 34 matching lines @@
 }
 
 // Block crossdomain subresource login prompting as a phishing defense.
 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());
 
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
   LoginPromptBrowserTestObserver observer;
   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());
 
@@ skipping 44 matching lines @@
   }
 
   EXPECT_EQ(1, observer.auth_needed_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
   ASSERT_TRUE(test_server()->Start());
 
   // Get NavigationController for tab 1.
-  content::WebContents* contents_1 = browser()->GetActiveWebContents();
+  content::WebContents* contents_1 = chrome::GetActiveWebContents(browser());
   NavigationController* controller_1 = &contents_1->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.
-  content::WebContents* contents_2 = browser()->GetActiveWebContents();
+  content::WebContents* contents_2 = chrome::GetActiveWebContents(browser());
   ASSERT_NE(contents_1, contents_2);
   NavigationController* controller_2 = &contents_2->GetController();
 
   LoginPromptBrowserTestObserver observer;
   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);
@@ skipping 30 matching lines @@
   EXPECT_EQ(2, observer.auth_needed_count_);
   EXPECT_EQ(2, observer.auth_supplied_count_);
   EXPECT_EQ(0, observer.auth_cancelled_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
   ASSERT_TRUE(test_server()->Start());
 
   // Get NavigationController for tab 1.
-  content::WebContents* contents_1 = browser()->GetActiveWebContents();
+  content::WebContents* contents_1 = chrome::GetActiveWebContents(browser());
   NavigationController* controller_1 = &contents_1->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.
-  content::WebContents* contents_2 = browser()->GetActiveWebContents();
+  content::WebContents* contents_2 = chrome::GetActiveWebContents(browser());
   ASSERT_NE(contents_1, contents_2);
   NavigationController* controller_2 = &contents_2->GetController();
 
   LoginPromptBrowserTestObserver observer;
   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);
@@ skipping 31 matching lines @@
   EXPECT_EQ(0, observer.auth_supplied_count_);
   EXPECT_EQ(2, observer.auth_cancelled_count_);
   EXPECT_TRUE(test_server()->Stop());
 }
 
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
                        SupplyRedundantAuthsMultiProfile) {
   ASSERT_TRUE(test_server()->Start());
 
   // Get NavigationController for regular tab.
-  content::WebContents* contents = browser()->GetActiveWebContents();
+  content::WebContents* contents = chrome::GetActiveWebContents(browser());
   NavigationController* controller = &contents->GetController();
 
   // Open an incognito window.
   Browser* browser_incognito = CreateIncognitoBrowser();
 
   // Get NavigationController for incognito tab.
   content::WebContents* contents_incognito =
-      browser_incognito->GetActiveWebContents();
+      chrome::GetActiveWebContents(browser_incognito);
   ASSERT_NE(contents, contents_incognito);
   NavigationController* controller_incognito =
       &contents_incognito->GetController();
 
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<NavigationController>(controller));
   LoginPromptBrowserTestObserver observer_incognito;
   observer_incognito.Register(
       content::Source<NavigationController>(controller_incognito));
 
@@ skipping 39 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