diff options
Diffstat (limited to 'content/shell/shell_browser_main.cc')
| -rw-r--r-- | content/shell/shell_browser_main.cc | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/content/shell/shell_browser_main.cc b/content/shell/shell_browser_main.cc index bf33753..9706e86 100644 --- a/content/shell/shell_browser_main.cc +++ b/content/shell/shell_browser_main.cc @@ -11,7 +11,6 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" -#include "base/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "content/public/browser/browser_main_runner.h" #include "content/shell/shell_switches.h" @@ -45,15 +44,8 @@ GURL GetURLForLayoutTest(const char* test_name, if (expected_pixel_hash) *expected_pixel_hash = pixel_hash; GURL test_url(path_or_url); - if (!(test_url.is_valid() && test_url.has_scheme())) { -#if defined(OS_WIN) - std::wstring wide_path_or_url = - base::SysNativeMBToWide(path_or_url); + if (!(test_url.is_valid() && test_url.has_scheme())) test_url = net::FilePathToFileURL(FilePath(path_or_url)); -#else - test_url = net::FilePathToFileURL(FilePath(path_or_url)); -#endif - } FilePath local_path; if (net::FileURLToFilePath(test_url, &local_path)) { // We're outside of the message loop here, and this is a test. |