Remove multi-install from install_static.

chrome/install_static/install_util.cc

 // Copyright 2014 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/install_static/install_util.h"
 
 #include <windows.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ skipping 239 matching lines @@
   std::basic_istringstream<typename StringType::value_type> buffer(str);
   for (StringType token; std::getline(buffer, token, delimiter);) {
     if (trim_spaces)
       TrimT<StringType>(&token);
     tokens.push_back(token);
   }
   return tokens;
 }
 
 std::wstring ChannelFromAdditionalParameters(const InstallConstants& mode,
-                                             bool system_level,
-                                             bool binaries) {
+                                             bool system_level) {
   assert(kUseGoogleUpdateIntegration);
-  // InitChannelInfo in google_update_settings.cc only reports a failure in the
-  // case of multi-install Chrome where the binaries' ClientState key exists,
-  // but that the "ap" value therein cannot be read due to some reason *other*
-  // than it not being present. This should be exceedingly rare. For
-  // simplicity's sake, use an empty |value| in case of any error whatsoever
-  // here.
+  // InitChannelInfo in google_update_settings.cc only reports a failure when
+  // Chrome's ClientState key exists but that the "ap" value therein cannot be
+  // read due to some reason *other* than it not being present. This should be
+  // exceedingly rare. For simplicity's sake, use an empty |value| in case of
+  // any error whatsoever here.
   std::wstring value;
   nt::QueryRegValueSZ(system_level ? nt::HKLM : nt::HKCU, nt::WOW6432,
-                      (binaries ? GetBinariesClientStateKeyPath()
-                                : GetClientStateKeyPath(mode.app_guid))
-                          .c_str(),
-                      kRegValueAp, &value);
+                      GetClientStateKeyPath(mode.app_guid).c_str(), kRegValueAp,
+                      &value);
 
   static constexpr wchar_t kChromeChannelBetaPattern[] = L"1?1-*";
   static constexpr wchar_t kChromeChannelBetaX64Pattern[] = L"*x64-beta*";
   static constexpr wchar_t kChromeChannelDevPattern[] = L"2?0-d*";
   static constexpr wchar_t kChromeChannelDevX64Pattern[] = L"*x64-dev*";
 
   std::transform(value.begin(), value.end(), value.begin(), ::tolower);
 
   // Empty channel names or those containing "stable" should be reported as
   // an empty string.
   std::wstring channel_name;
   if (value.empty() ||
       (value.find(kChromeChannelStableExplicit) != std::wstring::npos)) {
   } else if (MatchPattern(value, kChromeChannelDevPattern) ||
              MatchPattern(value, kChromeChannelDevX64Pattern)) {
     channel_name.assign(kChromeChannelDev);
   } else if (MatchPattern(value, kChromeChannelBetaPattern) ||
              MatchPattern(value, kChromeChannelBetaX64Pattern)) {
     channel_name.assign(kChromeChannelBeta);
   }
   // Else report values with garbage as stable since they will match the stable
   // rules in the update configs. ChannelInfo::GetChannelName painstakingly
   // strips off known modifiers (e.g., "-multi-full") to see if the empty string

[huangs, 2016/12/27 20:04:22]

Update comment re. "-multi-full"?

[grt (UTC plus 2), 2017/01/02 12:58:45]

Done.

   // remains, returning channel "unknown" if not. This differs here in that some
   // clients will tag crashes as "stable" rather than "unknown" via this
   // codepath, but it is an accurate reflection of which update channel the
   // client is on according to the server-side rules.
 
   return channel_name;
 }
 
 }  // namespace
 
 bool IsSystemInstall() {
   return InstallDetails::Get().system_level();
 }
 
-bool IsMultiInstall() {
-  return InstallDetails::Get().multi_install();
-}
-
 bool GetCollectStatsConsent() {
   bool enabled = true;
 
   if (ReportingIsEnforcedByPolicy(&enabled))
     return enabled;
 
   const bool system_install = IsSystemInstall();
 
   DWORD out_value = 0;
 
   // If system_install, first try ClientStateMedium in HKLM.
   if (system_install &&
       nt::QueryRegValueDWORD(
           nt::HKLM, nt::WOW6432,
-          InstallDetails::Get().GetClientStateMediumKeyPath(true).c_str(),
+          InstallDetails::Get().GetClientStateMediumKeyPath().c_str(),
           kRegValueUsageStats, &out_value)) {
     return (out_value == 1);
   }
 
   // Second, try ClientState.
   return (nt::QueryRegValueDWORD(
               system_install ? nt::HKLM : nt::HKCU, nt::WOW6432,
-              InstallDetails::Get().GetClientStateKeyPath(true).c_str(),
+              InstallDetails::Get().GetClientStateKeyPath().c_str(),
               kRegValueUsageStats, &out_value) &&
           out_value == 1);
 }
 
 bool GetCollectStatsInSample() {
   std::wstring registry_path = GetChromeInstallRegistryPath();
 
   DWORD out_value = 0;
   if (!nt::QueryRegValueDWORD(nt::HKCU, nt::WOW6432, registry_path.c_str(),
                               kRegValueChromeStatsSample, &out_value)) {
@@ skipping 157 matching lines @@
       std::wstring official_build;
       GetValueFromVersionResource(data.get(), L"Official Build",
                                   &official_build);
       if (official_build != L"1")
         version->append(L"-devel");
       GetValueFromVersionResource(data.get(), L"ProductShortName",
                                   product_name);
       GetValueFromVersionResource(data.get(), L"SpecialBuild", special_build);
     }
   }
-  *channel_name = GetChromeChannelName(true /* add_modifier */);
+  *channel_name = GetChromeChannelName(false);
 }
 
+// TODO(grt): Remove |add_modifier|.
 std::wstring GetChromeChannelName(bool add_modifier) {
-  const std::wstring& channel = InstallDetails::Get().channel();
-  if (!add_modifier || !IsMultiInstall())
-    return channel;
-  if (channel.empty())
-    return L"m";
-  return channel + L"-m";
+  return InstallDetails::Get().channel();
 }
 
 std::wstring GetBrowserCrashDumpAttemptsRegistryPath() {
   return GetChromeInstallRegistryPath().append(kBrowserCrashDumpMetricsSubKey);
 }
 
 bool MatchPattern(const std::wstring& source, const std::wstring& pattern) {
   assert(pattern.find(L"**") == std::wstring::npos);
   return MatchPatternImpl(source, pattern, 0, 0);
 }
@@ skipping 205 matching lines @@
       Trace(L"Failed to create directory %ls, last error is %d\n",
             full_path_str, error_code);
       return false;
     }
   }
   return true;
 }
 
 // This function takes these inputs rather than accessing the module's
 // InstallDetails instance since it is used to bootstrap InstallDetails.
-std::wstring DetermineChannel(const InstallConstants& mode,
-                              bool system_level,
-                              bool multi_install) {
+std::wstring DetermineChannel(const InstallConstants& mode, bool system_level) {
   if (!kUseGoogleUpdateIntegration)
     return std::wstring();
 
   switch (mode.channel_strategy) {
     case ChannelStrategy::UNSUPPORTED:
       assert(false);
       break;
     case ChannelStrategy::ADDITIONAL_PARAMETERS:
-      return ChannelFromAdditionalParameters(mode, system_level, multi_install);
+      return ChannelFromAdditionalParameters(mode, system_level);
     case ChannelStrategy::FIXED:
       return mode.default_channel_name;
   }
 
   return std::wstring();
 }
 
 }  // namespace install_static