Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/login/login_prompt_browsertest.cc

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc ('k') | chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/login/login_prompt_browsertest.cc
diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc
index 410ea946f3f8d1d8c2438a6adeacc54aefb9f8e6..9e5d455d2f4486d95eb6ba41b52467bc040a6e1e 100644
--- a/chrome/browser/ui/login/login_prompt_browsertest.cc
+++ b/chrome/browser/ui/login/login_prompt_browsertest.cc
@@ -10,8 +10,8 @@
#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/tabs/tab_strip_model.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"
@@ -254,7 +254,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, PrefetchAuthCancels) {
prerender::PrerenderManager::PrerenderManagerMode old_mode_;
} set_prefetch_for_test(true);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -275,7 +276,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestBasicAuth) {
ASSERT_TRUE(test_server()->Start());
GURL test_page = test_server()->GetURL(kAuthBasicPage);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -322,7 +324,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) {
ASSERT_TRUE(test_server()->Start());
GURL test_page = test_server()->GetURL(kAuthDigestPage);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -369,7 +372,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestDigestAuth) {
IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) {
ASSERT_TRUE(test_server()->Start());
- content::WebContents* contents1 = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents1 =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller1 = &contents1->GetController();
LoginPromptBrowserTestObserver observer;
@@ -382,7 +386,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestTwoAuths) {
NEW_FOREGROUND_TAB,
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
- content::WebContents* contents2 = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents2 =
+ browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_NE(contents1, contents2);
NavigationController* controller2 = &contents2->GetController();
observer.Register(content::Source<NavigationController>(controller2));
@@ -430,7 +435,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) {
GURL no_auth_page_2 = test_server()->GetURL("b");
GURL no_auth_page_3 = test_server()->GetURL("c");
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -527,7 +533,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmCancellation) {
ASSERT_TRUE(test_server()->Start());
GURL test_page = test_server()->GetURL(kMultiRealmTestPage);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -577,7 +584,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) {
ASSERT_TRUE(test_server()->Start());
GURL test_page = test_server()->GetURL(kMultiRealmTestPage);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -627,7 +635,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, IncorrectConfirmation) {
ASSERT_TRUE(test_server()->Start());
GURL test_page = test_server()->GetURL(kSingleRealmTestPage);
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -696,7 +705,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, NoLoginPromptForFavicon) {
ASSERT_TRUE(test_server()->Start());
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
@@ -751,7 +761,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, BlockCrossdomainPrompt) {
host_resolver()->AddRule("www.b.com", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -816,7 +827,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
ASSERT_TRUE(test_server()->Start());
// Get NavigationController for tab 1.
- content::WebContents* contents_1 = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents_1 =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller_1 = &contents_1->GetController();
// Open a new tab.
@@ -827,7 +839,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Get NavigationController for tab 2.
- content::WebContents* contents_2 = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents_2 =
+ browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_NE(contents_1, contents_2);
NavigationController* controller_2 = &contents_2->GetController();
@@ -878,7 +891,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
ASSERT_TRUE(test_server()->Start());
// Get NavigationController for tab 1.
- content::WebContents* contents_1 = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents_1 =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller_1 = &contents_1->GetController();
// Open a new tab.
@@ -889,7 +903,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
ui_test_utils::BROWSER_TEST_WAIT_FOR_TAB);
// Get NavigationController for tab 2.
- content::WebContents* contents_2 = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents_2 =
+ browser()->tab_strip_model()->GetActiveWebContents();
ASSERT_NE(contents_1, contents_2);
NavigationController* controller_2 = &contents_2->GetController();
@@ -941,7 +956,8 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
ASSERT_TRUE(test_server()->Start());
// Get NavigationController for regular tab.
- content::WebContents* contents = chrome::GetActiveWebContents(browser());
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
NavigationController* controller = &contents->GetController();
// Open an incognito window.
@@ -949,7 +965,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
// Get NavigationController for incognito tab.
content::WebContents* contents_incognito =
- chrome::GetActiveWebContents(browser_incognito);
+ browser_incognito->tab_strip_model()->GetActiveWebContents();
ASSERT_NE(contents, contents_incognito);
NavigationController* controller_incognito =
&contents_incognito->GetController();
« no previous file with comments | « chrome/browser/ui/gtk/location_bar_view_gtk_browsertest.cc ('k') | chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698