| Index: chrome/browser/browser_encoding_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/browser_encoding_browsertest.cc (revision 164732)
|
| +++ chrome/browser/browser_encoding_browsertest.cc (working copy)
|
| @@ -123,7 +123,7 @@
|
| test_file_path = test_file_path.AppendASCII(
|
| kEncodingTestDatas[i].file_name);
|
|
|
| - GURL url = URLRequestMockHTTPJob::GetMockUrl(test_file_path);
|
| + GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
|
|
|
| // When looping through all the above files in one WebContents, there's a
|
| // race condition on Windows trybots that causes the previous encoding to be
|
| @@ -147,7 +147,7 @@
|
|
|
| FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kOverrideTestDir);
|
| test_dir_path = test_dir_path.AppendASCII(kTestFileName);
|
| - GURL url = URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
|
| + GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
|
| ui_test_utils::NavigateToURL(browser(), url);
|
| content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
|
| EXPECT_EQ("ISO-8859-1", web_contents->GetEncoding());
|
| @@ -261,7 +261,7 @@
|
|
|
| FilePath test_file_path(test_dir_path);
|
| test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name);
|
| - GURL url = URLRequestMockHTTPJob::GetMockUrl(test_file_path);
|
| + GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path);
|
| ui_test_utils::NavigateToURL(browser(), url);
|
|
|
| // Get the encoding used for the page, it must be the default charset we
|
|
|