Include Google Update integration details in crash keys and about:version.

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 40 matching lines @@
 // Chrome channel display names.
 constexpr wchar_t kChromeChannelDev[] = L"dev";
 constexpr wchar_t kChromeChannelBeta[] = L"beta";
 constexpr wchar_t kChromeChannelStableExplicit[] = L"stable";
 
 // TODO(ananta)
 // http://crbug.com/604923
 // These constants are defined in the chrome/installer directory as well. We
 // need to unify them.
 constexpr wchar_t kRegValueAp[] = L"ap";
+constexpr wchar_t kRegValueName[] = L"name";
 constexpr wchar_t kRegValueUsageStats[] = L"usagestats";
 constexpr wchar_t kMetricsReportingEnabled[] = L"MetricsReportingEnabled";
 
 void Trace(const wchar_t* format_string, ...) {
   static const int kMaxLogBufferSize = 1024;
   static wchar_t buffer[kMaxLogBufferSize] = {};
 
   va_list args = {};
 
   va_start(args, format_string);
@@ skipping 172 matching lines @@
   std::vector<StringType> tokens;
   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;
 }
 
+// Returns Chrome's update channel name based on the contents of the "ap" value
+// found in Chrome's ClientState key. |update_ap|, if not null, is set to the
+// raw value read from the registry.
 std::wstring ChannelFromAdditionalParameters(const InstallConstants& mode,
                                              bool system_level,
-                                             bool from_binaries) {
+                                             bool from_binaries,
+                                             std::wstring* update_ap) {
   assert(kUseGoogleUpdateIntegration);
   // 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,
                       from_binaries
                           ? GetBinariesClientStateKeyPath().c_str()
                           : GetClientStateKeyPath(mode.app_guid).c_str(),
                       kRegValueAp, &value);
+  if (update_ap)
+    *update_ap = 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.
@@ skipping 510 matching lines @@
       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 from_binaries) {
+                              bool from_binaries,
+                              std::wstring* update_ap,
+                              std::wstring* update_cohort_name) {
   if (!kUseGoogleUpdateIntegration)
     return std::wstring();
 
+  if (update_cohort_name) {
+    // Cache the cohort name.
+    std::wstring path(from_binaries ? GetBinariesClientStateKeyPath()
+                                    : GetClientStateKeyPath(mode.app_guid));
+    path.append(L"\\cohort");
+    nt::QueryRegValueSZ(system_level ? nt::HKLM : nt::HKCU, nt::WOW6432,
+                        path.c_str(), kRegValueName, update_cohort_name);
+  }
+
   switch (mode.channel_strategy) {
     case ChannelStrategy::UNSUPPORTED:
       assert(false);
       break;
     case ChannelStrategy::ADDITIONAL_PARAMETERS:
-      return ChannelFromAdditionalParameters(mode, system_level, from_binaries);
+      return ChannelFromAdditionalParameters(mode, system_level, from_binaries,
+                                             update_ap);
     case ChannelStrategy::FIXED:
       return mode.default_channel_name;
   }
 
   return std::wstring();
 }
 
 }  // namespace install_static