Reland r161839 - [content shell] don't use webkit_support functions to manipulate URLs

content/shell/shell_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/shell/shell_browser_main.h"
 
 #include <iostream>
 
 #include "base/command_line.h"
+#include "base/file_path.h"
+#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"
 #include "content/shell/webkit_test_runner_host.h"
+#include "net/base/net_util.h"
 #include "webkit/support/webkit_support.h"
 
 namespace {
 
 GURL GetURLForLayoutTest(const char* test_name,
                          bool* enable_pixel_dumping,
                          std::string* expected_pixel_hash) {
   // A test name is formated like file:///path/to/test'--pixel-test'pixelhash
   std::string path_or_url = test_name;
   std::string pixel_switch;
   std::string pixel_hash;
   std::string::size_type separator_position = path_or_url.find('\'');
   if (separator_position != std::string::npos) {
     pixel_switch = path_or_url.substr(separator_position + 1);
     path_or_url.erase(separator_position);
   }
   separator_position = pixel_switch.find('\'');
   if (separator_position != std::string::npos) {
     pixel_hash = pixel_switch.substr(separator_position + 1);
     pixel_switch.erase(separator_position);
   }
   if (enable_pixel_dumping) {
     *enable_pixel_dumping =
         (pixel_switch == "--pixel-test" || pixel_switch == "-p");
   }
   if (expected_pixel_hash)
     *expected_pixel_hash = pixel_hash;
-  GURL test_url = webkit_support::CreateURLForPathOrURL(path_or_url);
-  {
+  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);
+    test_url = net::FilePathToFileURL(FilePath(wide_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.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-    webkit_support::SetCurrentDirectoryForFileURL(test_url);
+    file_util::SetCurrentDirectory(local_path.DirName());
   }
   return test_url;
 }
 
 }  // namespace
 
 // Main routine for running as the Browser process.
 int ShellBrowserMain(const content::MainFunctionParams& parameters) {
   scoped_ptr<content::BrowserMainRunner> main_runner_(
       content::BrowserMainRunner::Create());
@@ skipping 45 matching lines @@
     }
     exit_code = 0;
   } else {
     exit_code = main_runner_->Run();
   }
 
   main_runner_->Shutdown();
 
   return exit_code;
 }