diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-23 18:35:42 +0000 |
| commit | 4f260d0c40e2b63d2af72d667ca5b0518c2dff84 (patch) | |
| tree | 2c976dd8b8dc5c217646627205e61728e8891b03 /chrome/test | |
| parent | b3ae5db129f88dae153880e84bdabea8ce2ca89b (diff) | |
| download | chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.zip chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.gz chromium_src-4f260d0c40e2b63d2af72d667ca5b0518c2dff84.tar.bz2 | |
Update file version info/memory details/process utils to use string16.
BUG=23581
TEST=everything still works
Review URL: http://codereview.chromium.org/5968008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
| -rw-r--r-- | chrome/test/in_process_browser_test.cc | 5 | ||||
| -rw-r--r-- | chrome/test/reliability/page_load_test.cc | 3 | ||||
| -rw-r--r-- | chrome/test/startup/startup_test.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc index 39e8524..a90b265 100644 --- a/chrome/test/in_process_browser_test.cc +++ b/chrome/test/in_process_browser_test.cc @@ -88,12 +88,7 @@ InProcessBrowserTest::InProcessBrowserTest() FilePath chrome_path; CHECK(PathService::Get(base::FILE_EXE, &chrome_path)); chrome_path = chrome_path.DirName(); -#if defined(OS_WIN) chrome_path = chrome_path.Append(chrome::kBrowserProcessExecutablePath); -#elif defined(OS_POSIX) - chrome_path = chrome_path.Append( - WideToASCII(chrome::kBrowserProcessExecutablePath)); -#endif CHECK(PathService::Override(base::FILE_EXE, chrome_path)); test_server_.reset(new net::TestServer( diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 24bf087..ffa6190 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -163,7 +163,8 @@ class PageLoadTest : public UITest { #if defined(OS_WIN) // Check file version info for chrome dll. scoped_ptr<FileVersionInfo> file_info; - file_info.reset(FileVersionInfo::CreateFileVersionInfo(kChromeDll)); + file_info.reset( + FileVersionInfo::CreateFileVersionInfo(FilePath(kChromeDll))); last_change = WideToASCII(file_info->last_change()); #elif defined(OS_LINUX) || defined(OS_MACOSX) // TODO(fmeawad): On Mac, the version retrieved here belongs to the test diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc index 5cbdc10..e78083f 100644 --- a/chrome/test/startup/startup_test.cc +++ b/chrome/test/startup/startup_test.cc @@ -135,7 +135,7 @@ class StartupTest : public UIPerfTest { ASSERT_TRUE(PathService::Get(chrome::DIR_APP, &dir_app)); FilePath chrome_exe(dir_app.Append( - FilePath::FromWStringHack(chrome::kBrowserProcessExecutablePath))); + chrome::kBrowserProcessExecutablePath)); ASSERT_TRUE(EvictFileFromSystemCacheWrapper(chrome_exe)); #if defined(OS_WIN) // chrome.dll is windows specific. diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index f8c723b..ebc285ad 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -756,7 +756,7 @@ bool UITestBase::LaunchBrowserHelper(const CommandLine& arguments, bool wait, base::ProcessHandle* process) { FilePath command = browser_directory_.Append( - FilePath::FromWStringHack(chrome::kBrowserProcessExecutablePath)); + chrome::kBrowserProcessExecutablePath); CommandLine command_line(command); |