diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 16:06:13 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-03 16:06:13 +0000 |
| commit | c5e4a2224ab96a7380e768c6a6148985accd3488 (patch) | |
| tree | 993cafd3bd7514df75ff773879d3633ee916e3f8 /components | |
| parent | 3bc2e375275d2e3a2aa0d8766d8e17f766ddbf78 (diff) | |
| download | chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.zip chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.tar.gz chromium_src-c5e4a2224ab96a7380e768c6a6148985accd3488.tar.bz2 | |
Revert "Update all users of base::Version to explicitly specify the namespace, and clean up the header."
This is a speculative revert of r242414.
BUG=330681
TEST=as in bug
TBR=ben@chromium.org
Review URL: https://codereview.chromium.org/109673004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components')
| -rw-r--r-- | components/variations/processed_study.cc | 4 | ||||
| -rw-r--r-- | components/variations/variations_seed_processor_unittest.cc | 20 |
2 files changed, 14 insertions, 10 deletions
diff --git a/components/variations/processed_study.cc b/components/variations/processed_study.cc index a34f894..9d0e4f1 100644 --- a/components/variations/processed_study.cc +++ b/components/variations/processed_study.cc @@ -23,13 +23,13 @@ bool ValidateStudyAndComputeTotalProbability( return false; } if (study.filter().has_min_version() && - !base::Version::IsValidWildcardString(study.filter().min_version())) { + !Version::IsValidWildcardString(study.filter().min_version())) { DVLOG(1) << study.name() << " has invalid min version: " << study.filter().min_version(); return false; } if (study.filter().has_max_version() && - !base::Version::IsValidWildcardString(study.filter().max_version())) { + !Version::IsValidWildcardString(study.filter().max_version())) { DVLOG(1) << study.name() << " has invalid max version: " << study.filter().max_version(); return false; diff --git a/components/variations/variations_seed_processor_unittest.cc b/components/variations/variations_seed_processor_unittest.cc index e03fcd9..cbf0864 100644 --- a/components/variations/variations_seed_processor_unittest.cc +++ b/components/variations/variations_seed_processor_unittest.cc @@ -399,8 +399,9 @@ TEST_F(VariationsSeedProcessorTest, CheckStudyVersion) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(min_test_cases); ++i) { filter.set_min_version(min_test_cases[i].min_version); - const bool result = seed_processor.CheckStudyVersion( - filter, base::Version(min_test_cases[i].version)); + const bool result = + seed_processor.CheckStudyVersion(filter, + Version(min_test_cases[i].version)); EXPECT_EQ(min_test_cases[i].expected_result, result) << "Min. version case " << i << " failed!"; } @@ -408,8 +409,9 @@ TEST_F(VariationsSeedProcessorTest, CheckStudyVersion) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(max_test_cases); ++i) { filter.set_max_version(max_test_cases[i].max_version); - const bool result = seed_processor.CheckStudyVersion( - filter, base::Version(max_test_cases[i].version)); + const bool result = + seed_processor.CheckStudyVersion(filter, + Version(max_test_cases[i].version)); EXPECT_EQ(max_test_cases[i].expected_result, result) << "Max version case " << i << " failed!"; } @@ -421,14 +423,16 @@ TEST_F(VariationsSeedProcessorTest, CheckStudyVersion) { filter.set_max_version(max_test_cases[j].max_version); if (!min_test_cases[i].expected_result) { - const bool result = seed_processor.CheckStudyVersion( - filter, base::Version(min_test_cases[i].version)); + const bool result = + seed_processor.CheckStudyVersion( + filter, Version(min_test_cases[i].version)); EXPECT_FALSE(result) << "Case " << i << "," << j << " failed!"; } if (!max_test_cases[j].expected_result) { - const bool result = seed_processor.CheckStudyVersion( - filter, base::Version(max_test_cases[j].version)); + const bool result = + seed_processor.CheckStudyVersion( + filter, Version(max_test_cases[j].version)); EXPECT_FALSE(result) << "Case " << i << "," << j << " failed!"; } } |