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

Unified Diff: chrome/installer/setup/install_worker_unittest.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/common/service_process_util_mac.mm ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/setup/install_worker_unittest.cc
diff --git a/chrome/installer/setup/install_worker_unittest.cc b/chrome/installer/setup/install_worker_unittest.cc
index a683b0c458792f0ff0b4baa078655ff347907b08..2c58f47f2fab6011823345ac6a32d31d370009a2 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -165,8 +165,8 @@ class MockInstallerState : public InstallerState {
class InstallWorkerTest : public testing::Test {
public:
virtual void SetUp() {
- current_version_.reset(Version::GetVersionFromString("1.0.0.0"));
- new_version_.reset(Version::GetVersionFromString("42.0.0.0"));
+ current_version_.reset(new Version("1.0.0.0"));
+ new_version_.reset(new Version("42.0.0.0"));
// Don't bother ensuring that these paths exist. Since we're just
// building the work item lists and not running them, they shouldn't
@@ -190,7 +190,7 @@ class InstallWorkerTest : public testing::Test {
if (installation_state->GetProductState(
system_level, BrowserDistribution::CHROME_BINARIES) == NULL) {
MockProductState product_state;
- product_state.set_version(current_version_->Clone());
+ product_state.set_version(new Version(*current_version_));
installation_state->SetProductState(system_level,
BrowserDistribution::CHROME_BINARIES,
product_state);
@@ -205,7 +205,7 @@ class InstallWorkerTest : public testing::Test {
if (multi_install)
MaybeAddBinariesToInstallationState(system_level, installation_state);
MockProductState product_state;
- product_state.set_version(current_version_->Clone());
+ product_state.set_version(new Version(*current_version_));
product_state.set_multi_install(multi_install);
product_state.set_brand(L"TEST");
product_state.set_eula_accepted(1);
@@ -244,7 +244,7 @@ class InstallWorkerTest : public testing::Test {
if (multi_install)
MaybeAddBinariesToInstallationState(system_level, installation_state);
MockProductState product_state;
- product_state.set_version(current_version_->Clone());
+ product_state.set_version(new Version(*current_version_));
product_state.set_multi_install(multi_install);
BrowserDistribution* dist =
BrowserDistribution::GetSpecificDistribution(
@@ -498,7 +498,7 @@ TEST_F(InstallWorkerTest, GoogleUpdateWorkItemsTest) {
BuildChromeInstallationState(system_level, false));
MockProductState cf_state;
- cf_state.set_version(current_version_->Clone());
+ cf_state.set_version(new Version(*current_version_));
cf_state.set_multi_install(false);
installation_state->SetProductState(system_level,
@@ -571,7 +571,7 @@ TEST_F(InstallWorkerTest, AddUsageStatsWorkItems) {
BuildChromeInstallationState(system_level, multi_install));
MockProductState chrome_state;
- chrome_state.set_version(current_version_->Clone());
+ chrome_state.set_version(new Version(*current_version_));
chrome_state.set_multi_install(false);
chrome_state.set_usagestats(1);
« no previous file with comments | « chrome/common/service_process_util_mac.mm ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698