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

webkit/tools/test_shell/test_shell.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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 798 matching lines @@
 }
 
 bool GetPluginFinderURL(std::string* plugin_finder_url) {
   return false;
 }
 
 bool IsDefaultPluginEnabled() {
   FilePath exe_path;
 
   if (PathService::Get(base::FILE_EXE, &exe_path)) {
-    std::wstring exe_name = exe_path.BaseName().ToWStringHack();
-    if (StartsWith(exe_name, L"test_shell_tests", false))
+    std::string exe_name =
+        UTF16ToASCII(exe_path.BaseName().LossyDisplayName()));
+    if (StartsWith(exe_name, "test_shell_tests", false))
       return true;
   }
   return false;
 }
 
 bool IsProtocolSupportedForMedia(const GURL& url) {
   if (url.SchemeIsFile() ||
       url.SchemeIs("http") ||
       url.SchemeIs("https") ||
       url.SchemeIs("data"))
@@ skipping 64 matching lines @@
     for (size_t j = 0; j < arraysize(kPluginBlackList); ++j) {
       if (plugin_info.path.BaseName() == FilePath(kPluginBlackList[j])) {
         webkit::npapi::PluginList::Singleton()->DisablePlugin(plugin_info.path);
         plugins->erase(plugins->begin() + i);
       }
     }
   }
 }
 
 }  // namespace webkit_glue