Make 64-bit Chrome stable report as CHANNEL_STABLE

chrome/installer/util/channel_info.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/installer/util/channel_info.h"
 
 #include "base/logging.h"
 #include "base/win/registry.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/util_constants.h"
 
 using base::win::RegKey;
 
 namespace {
 
 const wchar_t kModChrome[] = L"-chrome";
 const wchar_t kModChromeFrame[] = L"-chromeframe";
 // TODO(huangs): Remove by M27.
 const wchar_t kModAppHostDeprecated[] = L"-apphost";
 const wchar_t kModAppLauncher[] = L"-applauncher";
 const wchar_t kModMultiInstall[] = L"-multi";
 const wchar_t kModReadyMode[] = L"-readymode";
 const wchar_t kModStage[] = L"-stage:";
 const wchar_t kSfxFull[] = L"-full";
 const wchar_t kSfxMigrating[] = L"-migrating";
 const wchar_t kSfxMultiFail[] = L"-multifail";
 
 const wchar_t* const kChannels[] = {
   installer::kChromeChannelBeta,
-  installer::kChromeChannelDev
+  installer::kChromeChannelDev,
+  installer::kChromeChannelStable64

[gab, 2014/08/25 20:44:40]

How about we instead just add kChromeChannelStable here? Then anything with
"stable" will come out as Stable, no need for special logic below.

And we can still also default to Stable when faced with "".

 };
 
 const wchar_t* const kModifiers[] = {
   kModStage,
   kModMultiInstall,
   kModChrome,
   kModChromeFrame,
   kModAppHostDeprecated,  // TODO(huangs): Remove by M27.
   kModAppLauncher,
   kModReadyMode,
@@ skipping 120 matching lines @@
 bool ChannelInfo::GetChannelName(std::wstring* channel_name) const {
   DCHECK(channel_name);
   if (value_.empty()) {
     channel_name->erase();
     return true;
   } else {
     for (const wchar_t* const* scan = &kChannels[0],
              *const* end = &kChannels[arraysize(kChannels)]; scan != end;
          ++scan) {
       if (value_.find(*scan) != std::wstring::npos) {
-        channel_name->assign(*scan);
+        // 64-bit Chrome stable reports as stable.
+        if (*scan == installer::kChromeChannelStable64)
+          channel_name->assign(installer::kChromeChannelStable);
+        else

[grt (UTC plus 2), 2014/08/25 21:01:29]

Since other stable codepaths clear channel_name, this should too. Using
kChromeChannelStable sticks out.

[gab, 2014/08/25 21:16:00]

Yes, exactly what me and Will are currently discussing over IM.

Stable being the empty string just makes everything weird...uh..

+          channel_name->assign(*scan);
         return true;
       }
     }
     // There may be modifiers present.  Strip them off and see if we're left
     // with the empty string (stable channel).
     std::wstring tmp_value = value_;
     for (int i = 0; i != NUM_MODIFIERS; ++i) {
       SetModifier(static_cast<ModifierIndex>(i), false, &tmp_value);
     }
     if (tmp_value.empty()) {
@@ skipping 115 matching lines @@
 
   for (int scan = 0; scan < NUM_MODIFIERS; ++scan) {
     ModifierIndex index = static_cast<ModifierIndex>(scan);
     modified = SetModifier(index, false, &value_) || modified;
   }
 
   return modified;
 }
 
 }  // namespace installer