| Index: chrome/installer/setup/setup_util_unittest.cc
|
| diff --git a/chrome/installer/setup/setup_util_unittest.cc b/chrome/installer/setup/setup_util_unittest.cc
|
| index c466f9cfc8c3ab622ce668dc9a0e232792347e8e..dde6e265c284b8fd75b14ee97f893cc8c30f0a1e 100644
|
| --- a/chrome/installer/setup/setup_util_unittest.cc
|
| +++ b/chrome/installer/setup/setup_util_unittest.cc
|
| @@ -96,7 +96,7 @@ TEST(SetupUtilTest, GetMaxVersionFromArchiveDirTest) {
|
| base::FilePath chrome_dir = test_dir.path().AppendASCII("1.0.0.0");
|
| base::CreateDirectory(chrome_dir);
|
| ASSERT_TRUE(base::PathExists(chrome_dir));
|
| - std::unique_ptr<Version> version(
|
| + std::unique_ptr<base::Version> version(
|
| installer::GetMaxVersionFromArchiveDir(test_dir.path()));
|
| ASSERT_EQ(version->GetString(), "1.0.0.0");
|
|
|
| @@ -288,9 +288,9 @@ class FindArchiveToPatchTest : public testing::Test {
|
| return static_cast<FakeProductState*>(const_cast<ProductState*>(product));
|
| }
|
|
|
| - void set_version(const Version& version) {
|
| + void set_version(const base::Version& version) {
|
| if (version.IsValid())
|
| - version_.reset(new Version(version));
|
| + version_.reset(new base::Version(version));
|
| else
|
| version_.reset();
|
| }
|
| @@ -306,8 +306,8 @@ class FindArchiveToPatchTest : public testing::Test {
|
| ASSERT_TRUE(test_dir_.CreateUniqueTempDir());
|
| registry_override_manager_.OverrideRegistry(HKEY_CURRENT_USER);
|
| registry_override_manager_.OverrideRegistry(HKEY_LOCAL_MACHINE);
|
| - product_version_ = Version("30.0.1559.0");
|
| - max_version_ = Version("47.0.1559.0");
|
| + product_version_ = base::Version("30.0.1559.0");
|
| + max_version_ = base::Version("47.0.1559.0");
|
|
|
| // Install the product according to the version.
|
| original_state_.reset(new FakeInstallationState());
|
| @@ -334,7 +334,7 @@ class FindArchiveToPatchTest : public testing::Test {
|
| original_state_.reset();
|
| }
|
|
|
| - base::FilePath GetArchivePath(const Version& version) const {
|
| + base::FilePath GetArchivePath(const base::Version& version) const {
|
| return test_dir_.path()
|
| .AppendASCII(version.GetString())
|
| .Append(installer::kInstallerDir)
|
| @@ -368,14 +368,14 @@ class FindArchiveToPatchTest : public testing::Test {
|
| FakeProductState::FromProductState(
|
| original_state_->GetNonVersionedProductState(kSystemInstall_,
|
| kProductType_))
|
| - ->set_version(Version());
|
| + ->set_version(base::Version());
|
| }
|
|
|
| static const bool kSystemInstall_;
|
| static const BrowserDistribution::Type kProductType_;
|
| base::ScopedTempDir test_dir_;
|
| - Version product_version_;
|
| - Version max_version_;
|
| + base::Version product_version_;
|
| + base::Version max_version_;
|
| std::unique_ptr<FakeInstallationState> original_state_;
|
| std::unique_ptr<installer::InstallerState> installer_state_;
|
|
|
|
|