diff options
author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 20:46:06 +0000 |
---|---|---|
committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-04 20:46:06 +0000 |
commit | ceeb87e90224c8743995b999661eede7c31b6346 (patch) | |
tree | 459f0698b022e42ead17cb742be9ff7f9d1b441f /webkit | |
parent | f3208bd4c625527d854c3bf49908352199488c48 (diff) | |
download | chromium_src-ceeb87e90224c8743995b999661eede7c31b6346.zip chromium_src-ceeb87e90224c8743995b999661eede7c31b6346.tar.gz chromium_src-ceeb87e90224c8743995b999661eede7c31b6346.tar.bz2 |
Get rid of kPathSeparator on windows. Port some wstring function to take FilePaths. Re-enable relevant posix unit tests.
Review URL: http://codereview.chromium.org/12893
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r-- | webkit/tools/test_shell/test_shell_win.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc index 1b71c2d..787ac1a 100644 --- a/webkit/tools/test_shell/test_shell_win.cc +++ b/webkit/tools/test_shell/test_shell_win.cc @@ -92,13 +92,13 @@ bool MinidumpCallback(const wchar_t *dumpPath, // will be happening on developers' machines where they have debuggers. StackWString<kPathBufSize * 2> origPath; origPath->append(dumpPath); - origPath->push_back(file_util::kPathSeparator); + origPath->push_back(FilePath::kSeparators[0]); origPath->append(minidumpID); origPath->append(L".dmp"); StackWString<kPathBufSize * 2> newPath; newPath->append(dumpPath); - newPath->push_back(file_util::kPathSeparator); + newPath->push_back(FilePath::kSeparators[0]); newPath->append(g_currentTestName); newPath->append(L"-"); newPath->append(minidumpID); @@ -329,7 +329,7 @@ std::string TestShell::RewriteLocalUrl(const std::string& url) { file_util::AppendToPath(&replace_url, L"data"); file_util::AppendToPath(&replace_url, L"layout_tests"); file_util::AppendToPath(&replace_url, L"LayoutTests"); - replace_url.push_back(file_util::kPathSeparator); + replace_url.push_back(FilePath::kSeparators[0]); new_url = std::string("file:///") + WideToUTF8(replace_url).append(url.substr(kPrefixLen)); } |