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

chrome/plugin/chrome_plugin_host.cc

 // Copyright (c) 2011 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 "chrome/plugin/chrome_plugin_host.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
@@ skipping 418 matching lines @@
   CHECK(ChromePluginLib::IsPluginThread());
 
   switch (type) {
   case CPBROWSINGCONTEXT_DATA_DIR_PTR: {
     if (buf_size < sizeof(char*))
       return sizeof(char*);
 
     FilePath path = CommandLine::ForCurrentProcess()->
                     GetSwitchValuePath(switches::kPluginDataDir);
     DCHECK(!path.empty());
-    std::string retval = WideToUTF8(
-        path.Append(chrome::kChromePluginDataDirname).ToWStringHack());
+    // TODO(evan): this is wrong.  We can't stuff a path through a UTF-8 string.
+    // But this code is only used by Gears, which will be removed eventually.
+    std::string retval = UTF16ToUTF8(
+        path.Append(chrome::kChromePluginDataDirname).LossyDisplayName());
     *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval);
 
     return CPERR_SUCCESS;
     }
   case CPBROWSINGCONTEXT_UI_LOCALE_PTR: {
     if (buf_size < sizeof(char*))
       return sizeof(char*);
 
     std::string retval = webkit_glue::GetWebKitLocale();
     *static_cast<char**>(buf) = CPB_StringDup(CPB_Alloc, retval);
@@ skipping 270 matching lines @@
 
     response_funcs.size = sizeof(response_funcs);
     response_funcs.received_redirect = CPRR_ReceivedRedirect;
     response_funcs.start_completed = CPRR_StartCompleted;
     response_funcs.read_completed = CPRR_ReadCompleted;
     response_funcs.upload_progress = CPRR_UploadProgress;
   }
 
   return &browser_funcs;
 }