Deprecate wstring version of PathService::Get() in webkit.

webkit/tools/test_shell/test_shell.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 "v8_proxy.h"
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
@@ skipping 48 matching lines @@
 const int kSVGTestWindowWidth = 480;
 const int kSVGTestWindowHeight = 360;
 
 // URLRequestTestShellFileJob is used to serve the inspector
 class URLRequestTestShellFileJob : public URLRequestFileJob {
  public:
   virtual ~URLRequestTestShellFileJob() { }
 
   static URLRequestJob* InspectorFactory(URLRequest* request,
                                          const std::string& scheme) {
-    std::wstring path;
+    FilePath path;
     PathService::Get(base::DIR_EXE, &path);
-    file_util::AppendToPath(&path, L"resources");
-    file_util::AppendToPath(&path, L"inspector");
-    file_util::AppendToPath(&path, UTF8ToWide(request->url().path()));
-    return new URLRequestTestShellFileJob(request,
-                                          FilePath::FromWStringHack(path));
+    path = path.AppendASCII("resources");
+    path = path.AppendASCII("inspector");
+    path = path.AppendASCII(request->url().path());
+    return new URLRequestTestShellFileJob(request, path);
   }
 
  private:
   URLRequestTestShellFileJob(URLRequest* request, const FilePath& path)
       : URLRequestFileJob(request, path) {
   }
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestTestShellFileJob);
 };
 
@@ skipping 490 matching lines @@
   return g_media_player_available;
 }
 
 void PrecacheUrl(const char16* url, int url_length) {}
 
 void AppendToLog(const char* file, int line, const char* msg) {
   logging::LogMessage(file, line).stream() << msg;
 }
 
 bool GetApplicationDirectory(std::wstring *path) {
-  return PathService::Get(base::DIR_EXE, path);
+  bool r;
+  FilePath fp;
+  r = PathService::Get(base::DIR_EXE, &fp);
+  *path = fp.ToWStringHack();
+  return r;
 }
 
 GURL GetInspectorURL() {
   return GURL("test-shell-resource://inspector/inspector.html");
 }
 
 std::string GetUIResourceProtocol() {
   return "test-shell-resource";
 }
 
 bool GetExeDirectory(std::wstring *path) {
-  return PathService::Get(base::DIR_EXE, path);
+  return GetApplicationDirectory(path);
 }
 
 bool SpellCheckWord(const wchar_t* word, int word_len,
                     int* misspelling_start, int* misspelling_len) {
   // Report all words being correctly spelled.
   *misspelling_start = 0;
   *misspelling_len = 0;
   return true;
 }
 
@@ skipping 17 matching lines @@
   }
 #endif  // OS_WIN
   return false;
 }
 
 std::wstring GetWebKitLocale() {
   return L"en-US";
 }
 
 }  // namespace webkit_glue