diff options
| author | xunjieli <xunjieli@chromium.org> | 2014-09-10 16:23:31 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-10 23:25:48 +0000 |
| commit | 0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8 (patch) | |
| tree | 0b5ee639c7015db3dc82b42ffc5f5a32f81fbbc0 /chrome/browser/browser_encoding_browsertest.cc | |
| parent | db7726aee7993008dff742790337f950fb371ebf (diff) | |
| download | chromium_src-0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8.zip chromium_src-0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8.tar.gz chromium_src-0332c191aa02efc6c24d0c87a1d41b7c12d3b8a8.tar.bz2 | |
Move url_request_mock_http_job to net/test/url_request/
This CL is a part of the effort to move mock URLRequestJob files
from content/test/net to net/test/url_request/. The reason for this
refactoring is that Cronet will need to use these classes for testing,
so it will be nice if they can be in net/test, as the dependency can
work out nicely.
BUG=
Review URL: https://codereview.chromium.org/541743002
Cr-Commit-Position: refs/heads/master@{#294255}
Diffstat (limited to 'chrome/browser/browser_encoding_browsertest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_browsertest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc index 2c1e6d2..2df4850 100644 --- a/chrome/browser/browser_encoding_browsertest.cc +++ b/chrome/browser/browser_encoding_browsertest.cc @@ -23,7 +23,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "content/public/test/test_navigation_observer.h" -#include "content/test/net/url_request_mock_http_job.h" +#include "net/test/url_request/url_request_mock_http_job.h" namespace { @@ -164,7 +164,7 @@ IN_PROC_BROWSER_TEST_P(BrowserEncodingTest, TestEncodingAliasMapping) { test_file_path = test_file_path.AppendASCII( GetParam().file_name); - GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path); + GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_file_path); ui_test_utils::NavigateToURL(browser(), url); EXPECT_EQ(GetParam().encoding_name, browser()->tab_strip_model()->GetActiveWebContents()-> @@ -185,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, TestOverrideEncoding) { base::FilePath test_dir_path = base::FilePath(kTestDir).AppendASCII(kOverrideTestDir); test_dir_path = test_dir_path.AppendASCII(kTestFileName); - GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_dir_path); + GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_dir_path); ui_test_utils::NavigateToURL(browser(), url); content::WebContents* web_contents = browser()->tab_strip_model()->GetActiveWebContents(); @@ -303,7 +303,7 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) { base::FilePath test_file_path(test_dir_path); test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name); - GURL url = content::URLRequestMockHTTPJob::GetMockUrl(test_file_path); + GURL url = net::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 |