Move GetVersionStringModifier() and GetChannel() from platform_util_* to chrome_version_info_*

chrome/browser/web_resource/promo_resource_service_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/json/json_reader.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 149 matching lines @@
   int64 actual_start = 1264899600 +  // unix epoch for Jan 31 2010 0100 GMT.
       promo_group * 2 * 60 * 60;
   EXPECT_EQ(promo_start, actual_start);
 
   double promo_end =
       prefs->GetDouble(prefs::kNTPPromoEnd);
   EXPECT_EQ(promo_end, 1327971600);  // unix epoch for Jan 31 2012 0100 GMT.
 }
 
 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\": {"
                      "    \"answers\": ["
                      "       {"
                      "        \"answer_id\": \"341252\","
                      "        \"name\": \"webstore_promo:15:1:\","
                      "        \"question\": \"The header!\","
                      "        \"inproduct_target\": \"The button label!\","
                      "        \"inproduct\": \"http://link.com\","
@@ skipping 43 matching lines @@
   MessageLoop loop;
 
   // Check that prefs are set correctly.
   web_resource_service_->UnpackWebStoreSignal(*(test_json.get()));
   EXPECT_FALSE(AppsPromo::IsPromoSupportedForLocale());
   EXPECT_TRUE(AppsPromo::IsWebStoreSupportedForLocale());
 }
 
 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));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(canary, 15));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(canary, 8));
   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));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(dev, 15));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(dev, 8));
   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));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(beta, 15));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(beta, 8));
   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));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 15));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 8));
   EXPECT_FALSE(PromoResourceService::IsBuildTargeted(stable, 11));
   EXPECT_TRUE(PromoResourceService::IsBuildTargeted(stable, 12));
 }