diff options
| author | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 19:03:37 +0000 |
|---|---|---|
| committer | amit@chromium.org <amit@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-16 19:03:37 +0000 |
| commit | 1db1b4967ac8f1ecccc9058fa14984982d0779e3 (patch) | |
| tree | 4f04151ceb6815e83e941f3ba9bc702fd9512977 /chrome_frame | |
| parent | f308683a147c096c4d4536e995ea906169af2040 (diff) | |
| download | chromium_src-1db1b4967ac8f1ecccc9058fa14984982d0779e3.zip chromium_src-1db1b4967ac8f1ecccc9058fa14984982d0779e3.tar.gz chromium_src-1db1b4967ac8f1ecccc9058fa14984982d0779e3.tar.bz2 | |
Installer cleanup
1] Remove installer::version and use base::version in installer
2] Use file_util::FileEnumerator instead of calling FindFirstFile directly
BUG=none
TEST=covered by existing tests
Review URL: http://codereview.chromium.org/5687004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/test_with_web_server.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc index da35740..07b099a 100644 --- a/chrome_frame/test/test_with_web_server.cc +++ b/chrome_frame/test/test_with_web_server.cc @@ -271,16 +271,14 @@ void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser, // the directory where chrome is installed. if (!version_info) { BrowserDistribution* dist = BrowserDistribution::GetDistribution(); - scoped_ptr<installer::Version> ver_system( - InstallUtil::GetChromeVersion(dist, true)); - scoped_ptr<installer::Version> ver_user( - InstallUtil::GetChromeVersion(dist, false)); + scoped_ptr<Version> ver_system(InstallUtil::GetChromeVersion(dist, true)); + scoped_ptr<Version> ver_user(InstallUtil::GetChromeVersion(dist, false)); ASSERT_TRUE(ver_system.get() || ver_user.get()); bool system_install = ver_system.get() ? true : false; FilePath cf_dll_path(installer::GetChromeInstallPath(system_install, dist)); - cf_dll_path = cf_dll_path.Append( - ver_system.get() ? ver_system->GetString() : ver_user->GetString()); + cf_dll_path = cf_dll_path.Append(UTF8ToWide( + ver_system.get() ? ver_system->GetString() : ver_user->GetString())); cf_dll_path = cf_dll_path.Append(kChromeFrameDllName); version_info = FileVersionInfo::CreateFileVersionInfo(cf_dll_path); if (version_info) |