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

chrome/browser/web_resource/promo_resource_service.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 "chrome/browser/web_resource/promo_resource_service.h"
 
 #include "base/string_number_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/apps_promo.h"
-#include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/sync_ui_util.h"
+#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_type.h"
 #include "googleurl/src/gurl.h"
 
 namespace {
 
 // Delay on first fetch so we don't interfere with startup.
 static const int kStartResourceFetchDelay = 5000;
@@ skipping 59 matching lines @@
   prefs->RegisterIntegerPref(
       prefs::kNTPPromoBuild,
       CANARY_BUILD | DEV_BUILD | BETA_BUILD | STABLE_BUILD,
       PrefService::UNSYNCABLE_PREF);
   prefs->RegisterIntegerPref(prefs::kNTPPromoGroupTimeSlice,
                              0,
                              PrefService::UNSYNCABLE_PREF);
 }
 
 // static
-bool PromoResourceService::IsBuildTargeted(platform_util::Channel channel,
+bool PromoResourceService::IsBuildTargeted(chrome::VersionInfo::Channel channel,
                                            int builds_allowed) {
   if (builds_allowed == NO_BUILD)
     return false;
   switch (channel) {
-    case platform_util::CHANNEL_CANARY:
+    case chrome::VersionInfo::CHANNEL_CANARY:
       return (CANARY_BUILD & builds_allowed) != 0;
-    case platform_util::CHANNEL_DEV:
+    case chrome::VersionInfo::CHANNEL_DEV:
       return (DEV_BUILD & builds_allowed) != 0;
-    case platform_util::CHANNEL_BETA:
+    case chrome::VersionInfo::CHANNEL_BETA:
       return (BETA_BUILD & builds_allowed) != 0;
-    case platform_util::CHANNEL_STABLE:
+    case chrome::VersionInfo::CHANNEL_STABLE:
       return (STABLE_BUILD & builds_allowed) != 0;
     default:
       return false;
   }
 }
 
 PromoResourceService::PromoResourceService(Profile* profile)
     : WebResourceService(profile,
                          profile->GetPrefs(),
                          PromoResourceService::kDefaultPromoResourceServer,
                          true,  // append locale to URL
                          NotificationType::PROMO_RESOURCE_STATE_CHANGED,
                          prefs::kNTPPromoResourceCacheUpdate,
                          kStartResourceFetchDelay,
                          kCacheUpdateDelay),
       web_resource_cache_(NULL),
-      channel_(platform_util::CHANNEL_UNKNOWN) {
+      channel_(chrome::VersionInfo::CHANNEL_UNKNOWN) {
   Init();
 }
 
 PromoResourceService::~PromoResourceService() { }
 
 void PromoResourceService::Init() {
   ScheduleNotificationOnInit();
 }
 
 bool PromoResourceService::IsThisBuildTargeted(int builds_targeted) {
-  if (channel_ == platform_util::CHANNEL_UNKNOWN) {
+  if (channel_ == chrome::VersionInfo::CHANNEL_UNKNOWN) {
     // GetChannel hits the registry on Windows. See http://crbug.com/70898.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-    channel_ = platform_util::GetChannel();
+    channel_ = chrome::VersionInfo::GetChannel();
   }
 
   return IsBuildTargeted(channel_, builds_targeted);
 }
 
 void PromoResourceService::Unpack(const DictionaryValue& parsed_json) {
   UnpackLogoSignal(parsed_json);
   UnpackPromoSignal(parsed_json);
   UnpackWebStoreSignal(parsed_json);
 }
@@ skipping 319 matching lines @@
   // Only show if not synced.
   bool is_synced =
       (profile->HasProfileSyncService() &&
           sync_ui_util::GetStatus(
               profile->GetProfileSyncService()) == sync_ui_util::SYNCED);
 
   bool is_promo_build = false;
   if (prefs->HasPrefPath(prefs::kNTPPromoBuild)) {
     // GetChannel hits the registry on Windows. See http://crbug.com/70898.
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-    platform_util::Channel channel = platform_util::GetChannel();
+    chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
     is_promo_build = PromoResourceService::IsBuildTargeted(
         channel, prefs->GetInteger(prefs::kNTPPromoBuild));
   }
 
   return !promo_closed && !is_synced && is_promo_build;
 }
 
 }  // namespace PromoResourceServiceUtil