Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3801)

Unified Diff: chrome_frame/test/test_with_web_server.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/dll_redirector_test.cc ('k') | content/browser/plugin_data_remover_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/test_with_web_server.cc
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index c56b60c51ffe9b93346bed9885222861ca4877b9..065dd42cb322aa967a7c3624f9ae2fa9866c9503 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -292,14 +292,16 @@ void ChromeFrameTestWithWebServer::VersionTest(BrowserKind browser,
// the directory where chrome is installed.
if (!version_info) {
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
- 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());
+ Version ver_system;
+ InstallUtil::GetChromeVersion(dist, true, &ver_system);
+ Version ver_user;
+ InstallUtil::GetChromeVersion(dist, false, &ver_system);
+ ASSERT_TRUE(ver_system.IsValid() || ver_user.IsValid());
- bool system_install = ver_system != NULL;
+ bool system_install = ver_system.IsValid();
FilePath cf_dll_path(installer::GetChromeInstallPath(system_install, dist));
cf_dll_path = cf_dll_path.Append(UTF8ToWide(
- ver_system.get() ? ver_system->GetString() : ver_user->GetString()));
+ ver_system.IsValid() ? ver_system.GetString() : ver_user.GetString()));
cf_dll_path = cf_dll_path.Append(kChromeFrameDllName);
version_info = FileVersionInfo::CreateFileVersionInfo(cf_dll_path);
if (version_info)
« no previous file with comments | « chrome_frame/test/dll_redirector_test.cc ('k') | content/browser/plugin_data_remover_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698