From 72cbd32707a2ede460bcc1b3cb199e653282a8ed Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Tue, 7 Apr 2009 10:17:12 +0000 Subject: Switching things to FilePath: Remove following deprecated wstring-using functions: net/net_util: FilePathToFileURL net/net_util: FileURLToFilePath Switch net/base/upload_data to FilePath. Switch upload-related parts of net/url_request/url_request to FilePath. Made necessary adjustments in rest of code (a lot). Review URL: http://codereview.chromium.org/63011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13242 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/tools/test_shell/test_shell_test.cc | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'webkit/tools/test_shell/test_shell_test.cc') diff --git a/webkit/tools/test_shell/test_shell_test.cc b/webkit/tools/test_shell/test_shell_test.cc index 1ce279a..c6e7ac4 100644 --- a/webkit/tools/test_shell/test_shell_test.cc +++ b/webkit/tools/test_shell/test_shell_test.cc @@ -4,16 +4,18 @@ #include "webkit/tools/test_shell/test_shell_test.h" +#include + #include "base/basictypes.h" +#include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/string_util.h" -std::wstring TestShellTest::GetTestURL(std::wstring test_case_path, - const std::wstring& test_case) { - file_util::AppendToPath(&test_case_path, test_case); - return test_case_path; +std::wstring TestShellTest::GetTestURL(const FilePath& test_case_path, + const std::string& test_case) { + return test_case_path.AppendASCII(test_case).ToWStringHack(); } void TestShellTest::SetUp() { @@ -23,8 +25,8 @@ void TestShellTest::SetUp() { // Point data_dir_ to the root of the test case dir ASSERT_TRUE(PathService::Get(base::DIR_SOURCE_ROOT, &data_dir_)); - file_util::AppendToPath(&data_dir_, L"webkit"); - file_util::AppendToPath(&data_dir_, L"data"); + data_dir_ = data_dir_.Append(FILE_PATH_LITERAL("webkit")); + data_dir_ = data_dir_.Append(FILE_PATH_LITERAL("data")); ASSERT_TRUE(file_util::PathExists(data_dir_)); } -- cgit v1.1