diff options
| author | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 18:53:52 +0000 |
|---|---|---|
| committer | kuchhal@chromium.org <kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-23 18:53:52 +0000 |
| commit | d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4 (patch) | |
| tree | 1e5eb583fb086699df3db28c776b88f655625784 /chrome_frame/test | |
| parent | 3a29e2911047223baf873271abacf5ae34502fc6 (diff) | |
| download | chromium_src-d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4.zip chromium_src-d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4.tar.gz chromium_src-d5937dff5bfa06d68262fc6d569cd5f5a6ac57c4.tar.bz2 | |
Revert "installer: clean up to use FilePath instead of std::wstring."
This reverts commit 9da05365beb211e3879e6049547e5e92c4c0a5a2 (r32811).
TBR=thiago.farina@gmail.com
BUG=32811
Review URL: http://codereview.chromium.org/437011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32817 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/chrome_frame_unittests.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/chrome_frame_unittests.cc b/chrome_frame/test/chrome_frame_unittests.cc index 5200ab5..225eda8 100644 --- a/chrome_frame/test/chrome_frame_unittests.cc +++ b/chrome_frame/test/chrome_frame_unittests.cc @@ -243,10 +243,10 @@ void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser, ASSERT_TRUE(ver_system || ver_user); bool system_install = ver_system ? true : false; - FilePath npchrome_path(installer::GetChromeInstallPath(system_install)); - npchrome_path = npchrome_path.Append( + std::wstring npchrome_path(installer::GetChromeInstallPath(system_install)); + file_util::AppendToPath(&npchrome_path, ver_system ? ver_system->GetString() : ver_user->GetString()); - npchrome_path = npchrome_path.Append(L"npchrome_tab.dll"); + file_util::AppendToPath(&npchrome_path, L"npchrome_tab.dll"); version_info = FileVersionInfo::CreateFileVersionInfo(npchrome_path); if (version_info) version = version_info->product_version(); |