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

Unified Diff: chrome/browser/web_resource/promo_resource_service_unittest.cc

Issue 7249003: Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_* (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: correct nits Created 9 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/browser/web_resource/promo_resource_service.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/web_resource/promo_resource_service_unittest.cc
diff --git a/chrome/browser/web_resource/promo_resource_service_unittest.cc b/chrome/browser/web_resource/promo_resource_service_unittest.cc
index 218af2f400c658e858e1ed0950512dc962ad5bc7..cef299838ed7159068677b1b430408acb8da5faf 100644
--- a/chrome/browser/web_resource/promo_resource_service_unittest.cc
+++ b/chrome/browser/web_resource/promo_resource_service_unittest.cc
@@ -167,7 +167,7 @@ TEST_F(PromoResourceServiceTest, UnpackPromoSignal) {
}
TEST_F(PromoResourceServiceTest, UnpackWebStoreSignal) {
- web_resource_service_->set_channel(platform_util::CHANNEL_DEV);
+ web_resource_service_->set_channel(chrome::VersionInfo::CHANNEL_DEV);
std::string json = "{ "
" \"topic\": {"
@@ -231,7 +231,8 @@ TEST_F(PromoResourceServiceTest, UnpackPartialWebStoreSignal) {
TEST_F(PromoResourceServiceTest, IsBuildTargeted) {
// canary
- const platform_util::Channel canary = platform_util::CHANNEL_CANARY;
+ const chrome::VersionInfo::Channel canary =
+ chrome::VersionInfo::CHANNEL_CANARY;
EXPECT_FALSE(PromoResourceService::IsBuildTargeted(canary, 1));
EXPECT_FALSE(PromoResourceService::IsBuildTargeted(canary, 3));
EXPECT_FALSE(PromoResourceService::IsBuildTargeted(canary, 7));
@@ -240,7 +241,8 @@ TEST_F(PromoResourceServiceTest, IsBuildTargeted) {
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(canary, 11));
// dev
- const platform_util::Channel dev = platform_util::CHANNEL_DEV;
+ const chrome::VersionInfo::Channel dev =
+ chrome::VersionInfo::CHANNEL_DEV;
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 1));
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 3));
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 7));
@@ -249,7 +251,8 @@ TEST_F(PromoResourceServiceTest, IsBuildTargeted) {
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 11));
// beta
- const platform_util::Channel beta = platform_util::CHANNEL_BETA;
+ const chrome::VersionInfo::Channel beta =
+ chrome::VersionInfo::CHANNEL_BETA;
EXPECT_FALSE(PromoResourceService::IsBuildTargeted(beta, 1));
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 3));
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 7));
@@ -258,7 +261,8 @@ TEST_F(PromoResourceServiceTest, IsBuildTargeted) {
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 11));
// stable
- const platform_util::Channel stable = platform_util::CHANNEL_STABLE;
+ const chrome::VersionInfo::Channel stable =
+ chrome::VersionInfo::CHANNEL_STABLE;
EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 1));
EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 3));
EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 7));
« no previous file with comments | « chrome/browser/web_resource/promo_resource_service.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698