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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8983012: Get rid of content::NavigationController in cc file and use "using" instead. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 12 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/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
===================================================================
--- chrome/browser/ui/login/login_prompt_browsertest.cc (revision 116288)
+++ chrome/browser/ui/login/login_prompt_browsertest.cc (working copy)
@@ -22,6 +22,7 @@
#include "net/base/auth.h"
#include "net/base/mock_host_resolver.h"
+using content::NavigationController;
using content::OpenURLParams;
using content::Referrer;
@@ -158,9 +159,9 @@
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
@@ -168,7 +169,7 @@
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) {}
@@ -244,11 +245,10 @@
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(
@@ -272,11 +272,10 @@
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.
@@ -372,11 +371,10 @@
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);
@@ -426,11 +424,10 @@
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;
@@ -480,11 +477,10 @@
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);
@@ -553,11 +549,10 @@
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.
@@ -611,10 +606,9 @@
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.
@@ -679,7 +673,7 @@
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.
@@ -694,14 +688,12 @@
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.
@@ -749,7 +741,7 @@
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.
@@ -764,14 +756,12 @@
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.
@@ -820,8 +810,7 @@
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();
@@ -831,14 +820,14 @@
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.
« 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