Index: chrome/browser/browser_encoding_browsertest.cc |
diff --git a/chrome/browser/browser_encoding_browsertest.cc b/chrome/browser/browser_encoding_browsertest.cc |
index f9116f8e960bd0722cf82d8dd8c8a97b93318678..99820d38a6fceef464d889464e74c445a40f872c 100644 |
--- a/chrome/browser/browser_encoding_browsertest.cc |
+++ b/chrome/browser/browser_encoding_browsertest.cc |
@@ -166,7 +166,8 @@ IN_PROC_BROWSER_TEST_P(BrowserEncodingTest, TestEncodingAliasMapping) { |
test_file_path = test_file_path.AppendASCII( |
GetParam().file_name); |
- GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_file_path); |
+ GURL url = |
+ net::URLRequestMockHTTPJob::GetMockUrl(test_file_path.MaybeAsASCII()); |
ui_test_utils::NavigateToURL(browser(), url); |
EXPECT_EQ(GetParam().encoding_name, |
browser()->tab_strip_model()->GetActiveWebContents()-> |
@@ -187,7 +188,8 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_TestOverrideEncoding) { |
base::FilePath test_dir_path = |
base::FilePath(kTestDir).AppendASCII(kOverrideTestDir); |
test_dir_path = test_dir_path.AppendASCII(kTestFileName); |
- GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_dir_path); |
+ GURL url = |
+ net::URLRequestMockHTTPJob::GetMockUrl(test_dir_path.MaybeAsASCII()); |
ui_test_utils::NavigateToURL(browser(), url); |
content::WebContents* web_contents = |
browser()->tab_strip_model()->GetActiveWebContents(); |
@@ -306,7 +308,8 @@ IN_PROC_BROWSER_TEST_F(BrowserEncodingTest, DISABLED_TestEncodingAutoDetect) { |
base::FilePath test_file_path(test_dir_path); |
test_file_path = test_file_path.AppendASCII(kTestDatas[i].test_file_name); |
- GURL url = net::URLRequestMockHTTPJob::GetMockUrl(test_file_path); |
+ GURL url = |
+ net::URLRequestMockHTTPJob::GetMockUrl(test_file_path.MaybeAsASCII()); |
ui_test_utils::NavigateToURL(browser(), url); |
// Get the encoding used for the page, it must be the default charset we |