| Index: chrome/common/channel_info_win.cc
|
| diff --git a/chrome/common/channel_info_win.cc b/chrome/common/channel_info_win.cc
|
| index 6e0874a03960555d5a76b5384b06ed5ad5715e09..cd8a3dd2ce803d88677edfb9de67936188164573 100644
|
| --- a/chrome/common/channel_info_win.cc
|
| +++ b/chrome/common/channel_info_win.cc
|
| @@ -8,8 +8,7 @@
|
| #include "base/profiler/scoped_tracker.h"
|
| #include "base/strings/string_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| -#include "chrome/install_static/install_details.h"
|
| -#include "components/version_info/version_info.h"
|
| +#include "chrome/install_static/install_util.h"
|
|
|
| namespace chrome {
|
|
|
| @@ -21,7 +20,7 @@ std::string GetChannelString() {
|
| "422460 VersionInfo::GetVersionStringModifier"));
|
|
|
| #if defined(GOOGLE_CHROME_BUILD)
|
| - base::string16 channel(install_static::InstallDetails::Get().channel());
|
| + base::string16 channel(install_static::GetChromeChannelName());
|
| #if defined(SYZYASAN)
|
| if (base::debug::IsBinaryInstrumented())
|
| channel += L" SyzyASan";
|
| @@ -33,21 +32,7 @@ std::string GetChannelString() {
|
| }
|
|
|
| version_info::Channel GetChannel() {
|
| -#if defined(GOOGLE_CHROME_BUILD)
|
| - base::string16 channel(install_static::InstallDetails::Get().channel());
|
| -
|
| - if (channel.empty()) {
|
| - return version_info::Channel::STABLE;
|
| - } else if (channel == L"beta") {
|
| - return version_info::Channel::BETA;
|
| - } else if (channel == L"dev") {
|
| - return version_info::Channel::DEV;
|
| - } else if (channel == L"canary") {
|
| - return version_info::Channel::CANARY;
|
| - }
|
| -#endif
|
| -
|
| - return version_info::Channel::UNKNOWN;
|
| + return install_static::GetChromeChannel();
|
| }
|
|
|
| } // namespace chrome
|
|
|