FilePath: Remove most of ToWStringHack, adding a LossyDisplayName()

webkit/support/webkit_support.cc

 // Copyright (c) 2010 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 "webkit/support/webkit_support.h"
 
 #include "app/gfx/gl/gl_context.h"
 #include "app/gfx/gl/gl_implementation.h"
 #include "base/at_exit.h"
 #include "base/base64.h"
@@ skipping 271 matching lines @@
   }
   return result.release();
 }
 
 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
     WebFrame*, WebKit::WebApplicationCacheHostClient* client) {
   return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
 }
 
 WebKit::WebString GetWebKitRootDir() {
-  FilePath path = GetWebKitRootDirFilePath();
-  return WebKit::WebString::fromUTF8(WideToUTF8(path.ToWStringHack()).c_str());
+  // In theory you cannot safely convert a path to a string, but this code
+  // is only used by tests.
+  return GetWebKitRootDirFilePath().LossyDisplayName();
 }
 
 void SetUpGLBindings(GLBindingPreferences bindingPref) {
   switch(bindingPref) {
     case GL_BINDING_DEFAULT:
       gfx::GLContext::InitializeOneOff();
       break;
     case GL_BINDING_SOFTWARE_RENDERER:
       gfx::InitializeGLBindings(gfx::kGLImplementationOSMesaGL);
       break;
@@ skipping 238 matching lines @@
 
 // FileSystem
 void OpenFileSystem(WebFrame* frame, WebFileSystem::Type type,
     long long size, bool create, WebFileSystemCallbacks* callbacks) {
   SimpleFileSystem* fileSystem = static_cast<SimpleFileSystem*>(
       test_environment->webkit_client()->fileSystem());
   fileSystem->OpenFileSystem(frame, type, size, create, callbacks);
 }
 
 }  // namespace webkit_support