From ceeb87e90224c8743995b999661eede7c31b6346 Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Thu, 4 Dec 2008 20:46:06 +0000 Subject: 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 --- chrome/browser/session_restore_uitest.cc | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) (limited to 'chrome/browser/session_restore_uitest.cc') diff --git a/chrome/browser/session_restore_uitest.cc b/chrome/browser/session_restore_uitest.cc index dede0fc9a..f93098a 100644 --- a/chrome/browser/session_restore_uitest.cc +++ b/chrome/browser/session_restore_uitest.cc @@ -21,13 +21,16 @@ namespace { class SessionRestoreUITest : public UITest { protected: SessionRestoreUITest() : UITest() { - std::wstring path_prefix = test_data_directory_; - file_util::AppendToPath(&path_prefix, L"session_history"); - path_prefix += file_util::kPathSeparator; - - url1 = net::FilePathToFileURL(path_prefix + L"bot1.html"); - url2 = net::FilePathToFileURL(path_prefix + L"bot2.html"); - url3 = net::FilePathToFileURL(path_prefix + L"bot3.html"); + FilePath path_prefix = FilePath::FromWStringHack(test_data_directory_); + path_prefix = path_prefix.Append(FILE_PATH_LITERAL("session_history")) + .Append(FilePath::StringType(&FilePath::kSeparators[0], 1)); + + url1 = net::FilePathToFileURL( + path_prefix.Append(FILE_PATH_LITERAL("bot1.html"))); + url2 = net::FilePathToFileURL( + path_prefix.Append(FILE_PATH_LITERAL("bot2.html"))); + url3 = net::FilePathToFileURL( + path_prefix.Append(FILE_PATH_LITERAL("bot3.html"))); } virtual void QuitBrowserAndRestore() { -- cgit v1.1