Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(92)

Unified Diff: webkit/tools/test_shell/node_leak_test.cc

Issue 99266: Deprecate wstring version of PathService::Get() in webkit. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/tools/test_shell/layout_test_controller.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/node_leak_test.cc
===================================================================
--- webkit/tools/test_shell/node_leak_test.cc (revision 15017)
+++ webkit/tools/test_shell/node_leak_test.cc (working copy)
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/file_path.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "net/http/http_cache.h"
@@ -37,11 +37,11 @@
js_flags += L" --expose-gc";
webkit_glue::SetJavaScriptFlags(js_flags);
- std::wstring cache_path =
- parsed_command_line.GetSwitchValue(test_shell::kCacheDir);
+ FilePath cache_path = FilePath::FromWStringHack(
+ parsed_command_line.GetSwitchValue(test_shell::kCacheDir));
if (cache_path.empty()) {
PathService::Get(base::DIR_EXE, &cache_path);
- file_util::AppendToPath(&cache_path, L"cache");
+ cache_path = cache_path.AppendASCII("cache");
}
if (parsed_command_line.HasSwitch(test_shell::kTestShellTimeOut)) {
@@ -58,7 +58,7 @@
parsed_command_line.HasSwitch(test_shell::kPlaybackMode) ?
net::HttpCache::PLAYBACK : net::HttpCache::NORMAL;
SimpleResourceLoaderBridge::Init(
- new TestShellRequestContext(cache_path, mode, false));
+ new TestShellRequestContext(cache_path.ToWStringHack(), mode, false));
TestShellTest::SetUp();
}
« no previous file with comments | « webkit/tools/test_shell/layout_test_controller.cc ('k') | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698