diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 10:17:12 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-04-07 10:17:12 +0000 |
| commit | 72cbd32707a2ede460bcc1b3cb199e653282a8ed (patch) | |
| tree | d212d36fbd064fd4b8c5783a9002f235c98d7a2d /chrome/browser/tab_restore_uitest.cc | |
| parent | 2fe25aac3d317086338a761e3b040cbcffc3a873 (diff) | |
| download | chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.zip chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.tar.gz chromium_src-72cbd32707a2ede460bcc1b3cb199e653282a8ed.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 34922e6..b72e6dc 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -3,6 +3,7 @@ // found in the LICENSE file. #include "base/command_line.h" +#include "base/file_path.h" #include "base/file_util.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" @@ -19,11 +20,10 @@ class TabRestoreUITest : public UITest { public: TabRestoreUITest() : UITest() { - std::wstring path_prefix = test_data_directory_; - file_util::AppendToPath(&path_prefix, L"session_history"); - path_prefix += FilePath::kSeparators[0]; - url1_ = net::FilePathToFileURL(path_prefix + L"bot1.html"); - url2_ = net::FilePathToFileURL(path_prefix + L"bot2.html"); + FilePath path_prefix(FilePath::FromWStringHack(test_data_directory_)); + path_prefix = path_prefix.AppendASCII("session_history"); + url1_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot1.html")); + url2_ = net::FilePathToFileURL(path_prefix.AppendASCII("bot2.html")); } protected: |