| Index: chrome/browser/web_resource/notification_promo.cc
|
| diff --git a/chrome/browser/web_resource/notification_promo.cc b/chrome/browser/web_resource/notification_promo.cc
|
| index 387af4c2909f35c25a5ed35884b24ade89fe047d..09c6ac610cffe876ed982ffafac0fd4bd6e509d8 100644
|
| --- a/chrome/browser/web_resource/notification_promo.cc
|
| +++ b/chrome/browser/web_resource/notification_promo.cc
|
| @@ -20,9 +20,10 @@
|
| #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"
|
| @@ -86,8 +87,7 @@ const char* ChannelString() {
|
| // 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";
|
| @@ -470,7 +470,7 @@ 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.
|
|
|