Cleanup VersionInfo after componentization.

chrome/browser/web_resource/notification_promo.cc

 // Copyright (c) 2012 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/notification_promo.h"
 
 #include <cmath>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/app_list/app_list_util.h"
 #include "chrome/browser/web_resource/promo_resource_service.h"
-#include "chrome/common/chrome_version_info.h"
+#include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
+#include "components/version_info/version_info.h"
 #include "content/public/browser/user_metrics.h"
 #include "net/base/url_util.h"
 #include "ui/base/device_form_factor.h"
 #include "url/gurl.h"
 
 using base::UserMetricsAction;
 
 namespace {
 
 const int kDefaultGroupSize = 100;
@@ skipping 43 matching lines @@
 #endif
 }
 
 // Returns a string suitable for the Promo Server URL 'dist' value.
 const char* ChannelString() {
 #if defined (OS_WIN)
   // GetChannel hits the registry on Windows. See http://crbug.com/70898.
   // TODO(achuith): Move NotificationPromo::PromoServerURL to the blocking pool.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 #endif
-  const version_info::Channel channel =
-      chrome::VersionInfo::GetChannel();
+  const version_info::Channel channel = chrome::GetChannel();
   switch (channel) {
     case version_info::Channel::CANARY:
       return "canary";
     case version_info::Channel::DEV:
       return "dev";
     case version_info::Channel::BETA:
       return "beta";
     case version_info::Channel::STABLE:
       return "stable";
     default:
@@ skipping 362 matching lines @@
   const base::Time last_view_time = base::Time::FromDoubleT(first_view_time_) +
                                     base::TimeDelta::FromSeconds(max_seconds_);
   return last_view_time < base::Time::Now();
 }
 
 // static
 GURL NotificationPromo::PromoServerURL() {
   GURL url(promo_server_url);
   AppendQueryParameter(&url, "dist", ChannelString());
   AppendQueryParameter(&url, "osname", PlatformString());
-  AppendQueryParameter(&url, "branding", chrome::VersionInfo().Version());
+  AppendQueryParameter(&url, "branding", version_info::GetVersionNumber());
   AppendQueryParameter(&url, "osver", base::SysInfo::OperatingSystemVersion());
   DVLOG(1) << "PromoServerURL=" << url.spec();
   // Note that locale param is added by WebResourceService.
   return url;
 }
 
 double NotificationPromo::StartTimeForGroup() const {
   if (group_ < initial_segment_)
     return start_;
   return start_ +
       std::ceil(static_cast<float>(group_ - initial_segment_ + 1) / increment_)
       * time_slice_;
 }
 
 double NotificationPromo::EndTime() const {
   return end_;
 }