Remove uses of BrowserDistribution::CHROME_BINARIES in installer_util.

chrome/common/channel_info_win.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/common/channel_info.h"
 
 #include "base/base_paths.h"
 #include "base/debug/profiler.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
@@ skipping 11 matching lines @@
   // fixed.
   tracked_objects::ScopedTracker tracking_profile(
       FROM_HERE_WITH_EXPLICIT_FUNCTION(
           "422460 VersionInfo::GetVersionStringModifier"));
 
 #if defined(GOOGLE_CHROME_BUILD)
   base::FilePath module;
   base::string16 channel;
   if (PathService::Get(base::FILE_MODULE, &module)) {
     bool is_system_install = !InstallUtil::IsPerUserInstall(module);
-    GoogleUpdateSettings::GetChromeChannelAndModifiers(is_system_install,
-                                                       &channel);
+    channel = GoogleUpdateSettings::GetChromeChannel(is_system_install);
   }
 #if defined(SYZYASAN)
   if (base::debug::IsBinaryInstrumented())
     channel += L" SyzyASan";

[Sébastien Marchand, 2017/01/09 20:41:22]

Should this go in the "if (PathService::Get(base::FILE_MODULE, &module)" block?

[grt (UTC plus 2), 2017/01/09 20:49:51]

Hmm. Having it out here means that " SyzyAsan" will be appended unconditionally
-- regardless of whether or not GoogleUpdateSettings could be used. I think this
is the right thing. The fact that Asan is active is independent of the condition
above. Does that make sense to you?

[Sébastien Marchand, 2017/01/09 20:56:14]

Ha yeah sorry, my question didn't really make sense :). Should we replace:
    channel += L" SyzyASan";
by:
    if (!channel.empty())
      channel += L' ';
    channel += 'SyzyAsan';

Otherwise we could end up in a situation where we have two spaces prefixing the
'SyzyAsan' tag, my OCD really don't like it. (this is beyond the scope of this
CL so I don't mind doing it in a separate CL if you want)

 #endif
   return base::UTF16ToASCII(channel);
 #else
   return std::string();
 #endif
 }
 
 version_info::Channel GetChannel() {
 #if defined(GOOGLE_CHROME_BUILD)
   std::wstring channel(L"unknown");
@@ skipping 12 matching lines @@
     return version_info::Channel::DEV;
   } else if (channel == L"canary") {
     return version_info::Channel::CANARY;
   }
 #endif
 
   return version_info::Channel::UNKNOWN;
 }
 
 }  // namespace chrome