diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 00:20:09 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 00:20:09 +0000 |
| commit | 2dbcad1cd7537645456400c42d8b69782f80bfc4 (patch) | |
| tree | 0b2a03b8863f7e3e2a5828eed0991d3bafcbb0fc /chrome/browser/errorpage_browsertest.cc | |
| parent | 413fcd026dff74cf460807cdecf44401cc13a9fa (diff) | |
| download | chromium_src-2dbcad1cd7537645456400c42d8b69782f80bfc4.zip chromium_src-2dbcad1cd7537645456400c42d8b69782f80bfc4.tar.gz chromium_src-2dbcad1cd7537645456400c42d8b69782f80bfc4.tar.bz2 | |
Move remaining content test code into the content namespace.
Review URL: https://codereview.chromium.org/11346016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164789 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/errorpage_browsertest.cc')
| -rw-r--r-- | chrome/browser/errorpage_browsertest.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index a3e96eb..c58eb84 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -20,6 +20,7 @@ using content::BrowserThread; using content::NavigationController; +using content::URLRequestFailedJob; class ErrorPageTest : public InProcessBrowserTest { public: @@ -32,7 +33,7 @@ class ErrorPageTest : public InProcessBrowserTest { void NavigateToFileURL(const FilePath::StringType& file_path) { ui_test_utils::NavigateToURL( browser(), - URLRequestMockHTTPJob::GetMockUrl(FilePath(file_path))); + content::URLRequestMockHTTPJob::GetMockUrl(FilePath(file_path))); } // Navigates to the given URL and waits for |num_navigations| to occur, and @@ -194,7 +195,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, DNSError_GoBack2Forward2) { // Test that a DNS error occuring in an iframe. IN_PROC_BROWSER_TEST_F(ErrorPageTest, IFrameDNSError_Basic) { NavigateToURLAndWaitForTitle( - URLRequestMockHTTPJob::GetMockUrl( + content::URLRequestMockHTTPJob::GetMockUrl( FilePath(FILE_PATH_LITERAL("iframe_dns_error.html"))), "Blah", 1); @@ -232,7 +233,7 @@ IN_PROC_BROWSER_TEST_F(ErrorPageTest, MAYBE_IFrameDNSError_GoBackAndForward) { // Checks that the Link Doctor is not loaded when we receive an actual 404 page. IN_PROC_BROWSER_TEST_F(ErrorPageTest, Page404) { NavigateToURLAndWaitForTitle( - URLRequestMockHTTPJob::GetMockUrl( + content::URLRequestMockHTTPJob::GetMockUrl( FilePath(FILE_PATH_LITERAL("page404.html"))), "SUCCESS", 1); |