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

webkit/tools/test_shell/layout_test_controller.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.
 
 // This file contains the definition for LayoutTestController.
 
 #include <vector>
 
 #include "webkit/tools/test_shell/layout_test_controller.h"
 
 #include "base/basictypes.h"
-#include "base/file_util.h"
+#include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebScriptSource.h"
 #include "webkit/glue/dom_operations.h"
 #include "webkit/glue/webframe.h"
 #include "webkit/glue/webpreferences.h"
 #include "webkit/glue/webview.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
@@ skipping 566 matching lines @@
 
 void LayoutTestController::pathToLocalResource(
     const CppArgumentList& args, CppVariant* result) {
   result->SetNull();
   if (args.size() <= 0 || !args[0].isString())
     return;
 
   std::string url = args[0].ToString();
   if (StartsWithASCII(url, "/tmp/", true)) {
     // We want a temp file.
-    std::wstring path;
+    FilePath path;
     PathService::Get(base::DIR_TEMP, &path);
-    file_util::AppendToPath(&path, UTF8ToWide(url.substr(5)));
-    result->Set(WideToUTF8(path));
+    path = path.AppendASCII(url.substr(5));
+    result->Set(WideToUTF8(path.ToWStringHack()));
     return;
   }
 
   // Some layout tests use file://// which we resolve as a UNC path.  Normalize
   // them to just file:///.
   while (StartsWithASCII(url, "file:////", false)) {
     url = url.substr(0, 8) + url.substr(9);
   }
   GURL location(TestShell::RewriteLocalUrl(url));
   result->Set(location.spec());
@@ skipping 154 matching lines @@
 void LayoutTestController::fallbackMethod(
     const CppArgumentList& args, CppVariant* result) {
   std::wstring message(L"JavaScript ERROR: unknown method called on LayoutTestController");
   if (!shell_->layout_test_mode()) {
     logging::LogMessage("CONSOLE:", 0).stream() << message;
   } else {
     printf("CONSOLE MESSAGE: %S\n", message.c_str());
   }
   result->SetNull();
 }