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

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

Issue 1281313003: base: Remove using:: declaration from version.h header. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more fixes Created 5 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/setup_util.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 91ab75452bd147b5ebcebf1ce45ea0e17d604e1a..c91cd682db47928cbdf2ce96984e80d4a07fd01e 100644
--- a/chrome/installer/setup/setup_util_unittest.cc
+++ b/chrome/installer/setup/setup_util_unittest.cc
@@ -95,7 +95,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));
- scoped_ptr<Version> version(
+ scoped_ptr<base::Version> version(
installer::GetMaxVersionFromArchiveDir(test_dir.path()));
ASSERT_EQ(version->GetString(), "1.0.0.0");
@@ -269,9 +269,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();
}
@@ -287,8 +287,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());
@@ -315,7 +315,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)
@@ -349,14 +349,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_;
scoped_ptr<FakeInstallationState> original_state_;
scoped_ptr<installer::InstallerState> installer_state_;
« no previous file with comments | « chrome/installer/setup/setup_util.cc ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698