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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9018016: Revert r115276, it broke PanelDownloadTest.Download in interactive_ui_tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years 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/login/login_prompt.cc ('k') | chrome/browser/ui/pdf/pdf_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 ba8dceaea947280ba2419d40172a4c5b019ae1f5..5917fc7b71fb058b0354bf4211075e5f18a90327 100644
--- a/chrome/browser/ui/login/login_prompt_browsertest.cc
+++ b/chrome/browser/ui/login/login_prompt_browsertest.cc
@@ -241,7 +241,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, PrefetchAuthCancels) {
TabContentsWrapper* contents =
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -267,7 +267,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -362,7 +362,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmCancellation) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -414,7 +414,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -466,7 +466,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, IncorrectConfirmation) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -537,7 +537,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, NoLoginPromptForFavicon) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -592,7 +592,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, BlockCrossdomainPrompt) {
TabContentsWrapper* contents = browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
@@ -658,7 +658,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents_1);
NavigationController* controller_1 =
- &contents_1->tab_contents()->GetController();
+ &contents_1->tab_contents()->controller();
// Open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
@@ -673,7 +673,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
ASSERT_TRUE(contents_2);
ASSERT_NE(contents_1, contents_2);
NavigationController* controller_2 =
- &contents_2->tab_contents()->GetController();
+ &contents_2->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller_1));
@@ -726,7 +726,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents_1);
NavigationController* controller_1 =
- &contents_1->tab_contents()->GetController();
+ &contents_1->tab_contents()->controller();
// Open a new tab.
ui_test_utils::NavigateToURLWithDisposition(
@@ -741,7 +741,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
ASSERT_TRUE(contents_2);
ASSERT_NE(contents_1, contents_2);
NavigationController* controller_2 =
- &contents_2->tab_contents()->GetController();
+ &contents_2->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller_1));
@@ -794,7 +794,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
TabContentsWrapper* contents =
browser()->GetSelectedTabContentsWrapper();
ASSERT_TRUE(contents);
- NavigationController* controller = &contents->tab_contents()->GetController();
+ NavigationController* controller = &contents->tab_contents()->controller();
// Open an incognito window.
Browser* browser_incognito = CreateIncognitoBrowser();
@@ -805,7 +805,7 @@ IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
ASSERT_TRUE(contents_incognito);
ASSERT_NE(contents, contents_incognito);
NavigationController* controller_incognito =
- &contents_incognito->tab_contents()->GetController();
+ &contents_incognito->tab_contents()->controller();
LoginPromptBrowserTestObserver observer;
observer.Register(content::Source<NavigationController>(controller));
« no previous file with comments | « chrome/browser/ui/login/login_prompt.cc ('k') | chrome/browser/ui/pdf/pdf_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698