Make 64-bit Chrome stable report as CHANNEL_STABLE

chrome/installer/util/channel_info.cc

Index: chrome/installer/util/channel_info.cc
diff --git a/chrome/installer/util/channel_info.cc b/chrome/installer/util/channel_info.cc
index 48a4e3212726311673908149099973b7111b7847..82bbdbf210f0a1339200fc1985abeb44f1b27986 100644
--- a/chrome/installer/util/channel_info.cc
+++ b/chrome/installer/util/channel_info.cc
@@ -27,7 +27,8 @@ 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[] = {
@@ -168,7 +169,11 @@ bool ChannelInfo::GetChannelName(std::wstring* channel_name) const {
              *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;
       }
     }