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

Unified Diff: chrome/installer/setup/install_worker_unittest.cc

Issue 2258243002: Consistently use namespaced base::Version in chrome/installer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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/installer/setup/install_worker.cc ('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 030cc7ca5a56a95829a7007cef4ee0e9f79eb4aa..46d432a0bf0742b34345a1f5752017366bda332e 100644
--- a/chrome/installer/setup/install_worker_unittest.cc
+++ b/chrome/installer/setup/install_worker_unittest.cc
@@ -115,7 +115,7 @@ class MockWorkItemList : public WorkItemList {
class MockProductState : public ProductState {
public:
// Takes ownership of |version|.
- void set_version(Version* version) { version_.reset(version); }
+ void set_version(base::Version* version) { version_.reset(version); }
void set_multi_install(bool multi) { multi_install_ = multi; }
void set_brand(const std::wstring& brand) { brand_ = brand; }
void set_eula_accepted(DWORD eula_accepted) {
@@ -182,8 +182,8 @@ class MockInstallerState : public InstallerState {
class InstallWorkerTest : public testing::Test {
public:
void SetUp() override {
- current_version_.reset(new Version("1.0.0.0"));
- new_version_.reset(new Version("42.0.0.0"));
+ current_version_.reset(new base::Version("1.0.0.0"));
+ new_version_.reset(new base::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
@@ -209,7 +209,7 @@ class InstallWorkerTest : public testing::Test {
if (installation_state->GetProductState(
system_level, BrowserDistribution::CHROME_BINARIES) == NULL) {
MockProductState product_state;
- product_state.set_version(new Version(*current_version_));
+ product_state.set_version(new base::Version(*current_version_));
product_state.set_brand(L"TEST");
product_state.set_multi_install(true);
BrowserDistribution* dist =
@@ -238,7 +238,7 @@ class InstallWorkerTest : public testing::Test {
if (multi_install)
MaybeAddBinariesToInstallationState(system_level, installation_state);
MockProductState product_state;
- product_state.set_version(new Version(*current_version_));
+ product_state.set_version(new base::Version(*current_version_));
product_state.set_multi_install(multi_install);
product_state.set_brand(L"TEST");
product_state.set_eula_accepted(1);
@@ -271,7 +271,7 @@ class InstallWorkerTest : public testing::Test {
if (multi_install)
MaybeAddBinariesToInstallationState(system_level, installation_state);
MockProductState product_state;
- product_state.set_version(new Version(*current_version_));
+ product_state.set_version(new base::Version(*current_version_));
product_state.set_multi_install(multi_install);
BrowserDistribution* dist =
BrowserDistribution::GetSpecificDistribution(
@@ -433,8 +433,8 @@ class InstallWorkerTest : public testing::Test {
}
protected:
- std::unique_ptr<Version> current_version_;
- std::unique_ptr<Version> new_version_;
+ std::unique_ptr<base::Version> current_version_;
+ std::unique_ptr<base::Version> new_version_;
base::FilePath archive_path_;
base::FilePath installation_path_;
base::FilePath setup_path_;
@@ -564,7 +564,7 @@ TEST_F(InstallWorkerTest, GoogleUpdateWorkItemsTest) {
BuildChromeInstallationState(system_level, false));
MockProductState cf_state;
- cf_state.set_version(new Version(*current_version_));
+ cf_state.set_version(new base::Version(*current_version_));
cf_state.set_multi_install(false);
// Per-machine single-install Chrome Frame is installed.
@@ -635,7 +635,7 @@ TEST_F(InstallWorkerTest, AddUsageStatsWorkItems) {
BuildChromeInstallationState(system_level, multi_install));
MockProductState chrome_state;
- chrome_state.set_version(new Version(*current_version_));
+ chrome_state.set_version(new base::Version(*current_version_));
chrome_state.set_multi_install(false);
chrome_state.set_usagestats(1);
« no previous file with comments | « chrome/installer/setup/install_worker.cc ('k') | chrome/installer/setup/setup_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698