4 files changed, 10 insertions, 6 deletions
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 9c421cd..9b19c5e 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -299,7 +299,7 @@ TEST_F(AutomationProxyTest, NavigateToURLWithTimeout1) {
   const int kLowTimeoutMs = 250;
   ASSERT_GE(URLRequestSlowHTTPJob::kDelayMs, kLowTimeoutMs);
   tab->NavigateToURLWithTimeout(
-      URLRequestSlowHTTPJob::GetMockUrl(filename.ToWStringHack()),
+      URLRequestSlowHTTPJob::GetMockUrl(filename),
       1, kLowTimeoutMs, &is_timeout);
   ASSERT_TRUE(is_timeout);
 }
@@ -319,7 +319,7 @@ TEST_F(AutomationProxyTest, NavigateToURLWithTimeout2) {
   const int kLowTimeoutMs = 250;
   ASSERT_GE(URLRequestSlowHTTPJob::kDelayMs, kLowTimeoutMs);
   tab->NavigateToURLWithTimeout(
-      URLRequestSlowHTTPJob::GetMockUrl(filename1.ToWStringHack()),
+      URLRequestSlowHTTPJob::GetMockUrl(filename1),
       1, kLowTimeoutMs, &is_timeout);
   ASSERT_TRUE(is_timeout);
 
diff --git a/chrome/test/interactive_ui/npapi_interactive_test.cc b/chrome/test/interactive_ui/npapi_interactive_test.cc
index 9610f39..e0b4dd8 100644
--- a/chrome/test/interactive_ui/npapi_interactive_test.cc
+++ b/chrome/test/interactive_ui/npapi_interactive_test.cc
@@ -85,7 +85,8 @@ TEST_F(NPAPIVisiblePluginTester, GetURLRequest404Response) {
     return;
 
   GURL url(URLRequestMockHTTPJob::GetMockUrl(
-      L"npapi/plugin_url_request_404.html"));
+               FilePath(FILE_PATH_LITERAL(
+                            "npapi/plugin_url_request_404.html"))));
 
   NavigateToURL(url);
 
diff --git a/chrome/test/plugin/plugin_test.cpp b/chrome/test/plugin/plugin_test.cpp
index 65eca9a..b9a1011 100644
--- a/chrome/test/plugin/plugin_test.cpp
+++ b/chrome/test/plugin/plugin_test.cpp
@@ -105,8 +105,10 @@ class PluginTest : public UITest {
   // HTML for the tests is all located in test_directory\plugin\<testcase>
   // Set |mock_http| to true to use mock HTTP server.
   GURL GetTestUrl(const std::wstring &test_case, bool mock_http) {
-    if (mock_http)
-      return URLRequestMockHTTPJob::GetMockUrl(L"plugin/" + test_case);
+    if (mock_http) {
+      return URLRequestMockHTTPJob::GetMockUrl(
+                 FilePath(L"plugin/" + test_case));
+    }
 
     FilePath path;
     PathService::Get(chrome::DIR_TEST_DATA, &path);
diff --git a/chrome/test/ui/npapi_uitest.cc b/chrome/test/ui/npapi_uitest.cc
index e1a0193..39e0571 100644
--- a/chrome/test/ui/npapi_uitest.cc
+++ b/chrome/test/ui/npapi_uitest.cc
@@ -319,7 +319,8 @@ TEST_F(NPAPIVisiblePluginTester, GetURLRequestFailWrite) {
     return;
 
   GURL url(URLRequestMockHTTPJob::GetMockUrl(
-      L"npapi/plugin_url_request_fail_write.html"));
+               FilePath(FILE_PATH_LITERAL(
+                            "npapi/plugin_url_request_fail_write.html"))));
 
   NavigateToURL(url);