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

chrome/browser/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/browser/chrome_plugin_host.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 446 matching lines @@
   case CPBROWSINGCONTEXT_DATA_DIR_PTR: {
     if (buf_size < sizeof(char*))
       return sizeof(char*);
 
     // TODO(mpcomplete): http://b/1143021 - When we support multiple profiles,
     // fetch the data dir from the context.
     PluginService* service = PluginService::GetInstance();
     if (!service)
       return CPERR_FAILURE;
     FilePath path = service->GetChromePluginDataDir();
-    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());

[Evan Martin, 2011/02/01 22:31:24]

In retrospect, as a way of asserting this is Windows-only, I should probably
just use .value().

[Mark Mentovai, 2011/02/01 22:42:44]

Evan Martin wrote:
In platform-specific code, that’s OK.

[Avi (use Gerrit), 2011/02/01 22:46:25]

That sounds good.

     *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*);
 
     PluginService* service = PluginService::GetInstance();
     if (!service)
       return CPERR_FAILURE;
@@ skipping 348 matching lines @@
                      CPBrowsingContext context) {
   // Sadly if we try and pass context through, we seem to break cl's little
   // brain trying to compile the Tuple3 ctor. This cast works.
   int32 context_as_int32 = static_cast<int32>(context);
   // Plugins can only be accessed on the IO thread.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableFunction(PluginCommandHandler::HandleCommand,
                           command, data, context_as_int32));
 }