Use explicit WebString conversions in LayoutTest related files

content/shell/renderer/layout_test/blink_test_runner.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/renderer/layout_test/blink_test_runner.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <clocale>
@@ skipping 315 matching lines @@
 
 WebString BlinkTestRunner::GetAbsoluteWebStringFromUTF8Path(
     const std::string& utf8_path) {
   base::FilePath path = base::FilePath::FromUTF8Unsafe(utf8_path);
   if (!path.IsAbsolute()) {
     GURL base_url =
         net::FilePathToFileURL(test_config_.current_working_directory.Append(
             FILE_PATH_LITERAL("foo")));
     net::FileURLToFilePath(base_url.Resolve(utf8_path), &path);
   }
-  return path.AsUTF16Unsafe();
+  return blink::FilePathToWebString(path);
 }
 
 WebURL BlinkTestRunner::LocalFileToDataURL(const WebURL& file_url) {
   base::FilePath local_path;
   if (!net::FileURLToFilePath(file_url, &local_path))
     return WebURL();
 
   std::string contents;
   Send(new LayoutTestHostMsg_ReadFileToString(
         routing_id(), local_path, &contents));
@@ skipping 16 matching lines @@
 
   const char kPrefix[] = "file:///tmp/LayoutTests/";
   const int kPrefixLen = arraysize(kPrefix) - 1;
 
   if (utf8_url.compare(0, kPrefixLen, kPrefix, kPrefixLen))
     return WebURL(GURL(utf8_url));
 
   base::FilePath replace_path =
       LayoutTestRenderThreadObserver::GetInstance()->webkit_source_dir()
           .Append(FILE_PATH_LITERAL("LayoutTests/"));
-#if defined(OS_WIN)
-  std::string utf8_path = base::WideToUTF8(replace_path.value());
-#else
-  std::string utf8_path =
-      base::WideToUTF8(base::SysNativeMBToWide(replace_path.value()));
-#endif
+  std::string utf8_path = replace_path.AsUTF8Unsafe();
   std::string new_url =
       std::string("file://") + utf8_path + utf8_url.substr(kPrefixLen);
   return WebURL(GURL(new_url));
 }
 
 test_runner::TestPreferences* BlinkTestRunner::Preferences() {
   return &prefs_;
 }
 
 void BlinkTestRunner::ApplyPreferences() {
@@ skipping 642 matching lines @@
 void BlinkTestRunner::ReportLeakDetectionResult(
     const LeakDetectionResult& report) {
   Send(new ShellViewHostMsg_LeakDetectionDone(routing_id(), report));
 }
 
 void BlinkTestRunner::OnDestruct() {
   delete this;
 }
 
 }  // namespace content