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_history_uitest.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'chrome/browser/session_history_uitest.cc') diff --git a/chrome/browser/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index dc72ef1..251a3ba 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -22,11 +22,11 @@ const wchar_t kDocRoot[] = L"chrome/test/data"; class SessionHistoryTest : public UITest { protected: SessionHistoryTest() : UITest() { - wstring path_prefix = test_data_directory_; - file_util::AppendToPath(&path_prefix, L"session_history"); - path_prefix += file_util::kPathSeparator; + FilePath path = FilePath::FromWStringHack(test_data_directory_); + path = path.Append(FILE_PATH_LITERAL("session_history")) + .Append(FilePath::StringType(&FilePath::kSeparators[0], 1)); - url_prefix_ = UTF8ToWide(net::FilePathToFileURL(path_prefix).spec()); + url_prefix_ = UTF8ToWide(net::FilePathToFileURL(path).spec()); } virtual void SetUp() { -- cgit v1.1