summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_encoding_uitest.cc
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:32:19 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-14 20:32:19 +0000
commit158a0892d261b8c717f2bc92bec4649898e4da96 (patch)
treea9ffd69181f6798160a59384d2e6088771364c29 /chrome/browser/browser_encoding_uitest.cc
parent866ba3fc1097334050b59b919e12e11314f2965d (diff)
downloadchromium_src-158a0892d261b8c717f2bc92bec4649898e4da96.zip
chromium_src-158a0892d261b8c717f2bc92bec4649898e4da96.tar.gz
chromium_src-158a0892d261b8c717f2bc92bec4649898e4da96.tar.bz2
Use FilePath in URLRequestMocks.
BUG=24672 TEST=compiles Review URL: http://codereview.chromium.org/271066 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29013 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
-rw-r--r--chrome/browser/browser_encoding_uitest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc
index 980aa30..8d68314 100644
--- a/chrome/browser/browser_encoding_uitest.cc
+++ b/chrome/browser/browser_encoding_uitest.cc
@@ -98,7 +98,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) {
test_file_path = test_file_path.AppendASCII(
kEncodingTestDatas[i].file_name);
GURL url =
- URLRequestMockHTTPJob::GetMockUrl(test_file_path.ToWStringHack());
+ URLRequestMockHTTPJob::GetMockUrl(test_file_path);
scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
ASSERT_TRUE(tab_proxy.get());
@@ -123,7 +123,7 @@ TEST_F(BrowserEncodingTest, TestOverrideEncoding) {
FilePath test_dir_path = FilePath(kTestDir).AppendASCII(kOverrideTestDir);
test_dir_path = test_dir_path.AppendASCII(kTestFileName);
- GURL url = URLRequestMockHTTPJob::GetMockUrl(test_dir_path.ToWStringHack());
+ GURL url = URLRequestMockHTTPJob::GetMockUrl(test_dir_path);
scoped_refptr<TabProxy> tab_proxy(GetActiveTab());
ASSERT_TRUE(tab_proxy.get());
ASSERT_TRUE(tab_proxy->NavigateToURL(url));
@@ -250,7 +250,7 @@ TEST_F(BrowserEncodingTest, TestEncodingAutoDetect) {
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.ToWStringHack());
+ URLRequestMockHTTPJob::GetMockUrl(test_file_path);
ASSERT_TRUE(tab->NavigateToURL(url));
WaitUntilTabCount(1);