Use {As,From}UTF16Unsafe instead of file_path_string_conversions.{h,cc}.

content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc

Index: content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
diff --git a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
index b503003175f34e37ddcd51bb991e8cc21278c416..69b7fb30a18b9d866abc91ea7b6fb7287f80077a 100644
--- a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
+++ b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.cc
@@ -9,7 +9,6 @@
 #include "base/sys_info.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "third_party/WebKit/public/platform/WebString.h"
-#include "webkit/base/file_path_string_conversions.h"
 
 namespace content {
 
@@ -95,14 +94,14 @@ void BrowserWebKitPlatformSupportImpl::getPluginList(bool refresh,
 
 int BrowserWebKitPlatformSupportImpl::databaseDeleteFile(
     const WebKit::WebString& vfs_file_name, bool sync_dir) {
-  const base::FilePath path = webkit_base::WebStringToFilePath(vfs_file_name);
+  const base::FilePath& path = base::FilePath::FromUTF16Unsafe(vfs_file_name);
   return file_util::Delete(path, false) ? 0 : 1;
 }
 
 long long BrowserWebKitPlatformSupportImpl::availableDiskSpaceInBytes(
     const WebKit::WebString& fileName) {
   return base::SysInfo::AmountOfFreeDiskSpace(
-      webkit_base::WebStringToFilePath(fileName));
+      base::FilePath::FromUTF16Unsafe(fileName));
 }
 
 }  // namespace content