Deprecate PathService::Get(..., wstring*) and use FilePath instead.

webkit/glue/plugins/plugin_list_win.cc

 // Copyright (c) 2006-2008 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 <tchar.h>
 
 #include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 103 matching lines @@
   GetFirefoxInstalledPaths(&paths);
   for (unsigned int i = 0; i < paths.size(); ++i) {
     plugin_dirs->insert(paths[i].Append(L"plugins"));
   }
 
   GetPluginsInRegistryDirectory(
       HKEY_CURRENT_USER, kRegistryMozillaPlugins, plugin_dirs);
   GetPluginsInRegistryDirectory(
       HKEY_LOCAL_MACHINE, kRegistryMozillaPlugins, plugin_dirs);
 
-  std::wstring firefox_app_data_plugin_path;
+  FilePath firefox_app_data_plugin_path;
   if (PathService::Get(base::DIR_APP_DATA, &firefox_app_data_plugin_path)) {
-    firefox_app_data_plugin_path += L"\\Mozilla\\plugins";
-    plugin_dirs->insert(FilePath(firefox_app_data_plugin_path));
+    firefox_app_data_plugin_path =
+        firefox_app_data_plugin_path.AppendASCII("Mozilla/plugins");

[tony, 2009/10/19 22:46:49]

Is it safe to embed the '/' here or do you need to call AppendASCII twice?

[Evan Stade, 2009/10/19 22:54:31]

<bikeshedding>

I agree AppendASCII twice is probably better, but since this is Windows-only you
can use Append with a wide literal string

</bikeshedding>

+    plugin_dirs->insert(firefox_app_data_plugin_path);
   }
 }
 
 // Hardcoded logic to detect Acrobat plugins locations.
 void GetAcrobatDirectory(std::set<FilePath>* plugin_dirs) {
   FilePath path;
   if (!GetInstalledPath(kRegistryAcrobatReader, &path) &&
       !GetInstalledPath(kRegistryAcrobat, &path)) {
     return;
   }
@@ skipping 194 matching lines @@
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
 } // namespace NPAPI