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

Unified Diff: chrome/browser/errorpage_browsertest.cc

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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
Index: chrome/browser/errorpage_browsertest.cc
===================================================================
--- chrome/browser/errorpage_browsertest.cc (revision 164732)
+++ chrome/browser/errorpage_browsertest.cc (working copy)
@@ -20,6 +20,7 @@
using content::BrowserThread;
using content::NavigationController;
+using content::URLRequestFailedJob;
class ErrorPageTest : public InProcessBrowserTest {
public:
@@ -32,7 +33,7 @@
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 @@
// 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 @@
// 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);
« no previous file with comments | « chrome/browser/download/save_page_browsertest.cc ('k') | chrome/browser/extensions/api/downloads/downloads_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698