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

chrome/browser/chrome_browser_main_win.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/browser/chrome_browser_main_win.h"
 
 #include <shellapi.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <windows.h>
@@ skipping 39 matching lines @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/conflicts/module_watcher_win.h"
 #include "chrome/common/crash_keys.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/install_static/install_details.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/helper.h"
 #include "chrome/installer/util/install_util.h"
 #include "chrome/installer/util/installer_util_strings.h"
 #include "chrome/installer/util/l10n_string_util.h"
 #include "chrome/installer/util/shell_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_switches.h"
@@ skipping 244 matching lines @@
   }
 }
 
 int ChromeBrowserMainPartsWin::PreCreateThreads() {
   // Record whether the machine is enterprise managed in a crash key. This will
   // be used to better identify whether crashes are from enterprise users.
   base::debug::SetCrashKeyValue(
       crash_keys::kIsEnterpriseManaged,
       base::win::IsEnterpriseManaged() ? "yes" : "no");
 
+  // Set crash keys containing the registry values used to determine Chrome's
+  // update channel at process startup; see https://crbug.com/579504.
+  const auto& details = install_static::InstallDetails::Get();
+  base::debug::SetCrashKeyValue(crash_keys::kApValue,
+                                base::UTF16ToUTF8(details.update_ap()));
+  base::debug::SetCrashKeyValue(
+      crash_keys::kCohortName, base::UTF16ToUTF8(details.update_cohort_name()));
+
   int rv = ChromeBrowserMainParts::PreCreateThreads();
 
   // TODO(viettrungluu): why don't we run this earlier?
   if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs) &&
       base::win::GetVersion() < base::win::VERSION_XP) {
     chrome::ShowWarningMessageBox(
         NULL, l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
         l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP));
   }
 
@@ skipping 218 matching lines @@
   if (resource_id)
     return l10n_util::GetStringUTF16(resource_id);
   return base::string16();
 }
 
 // static
 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
   CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
   installer::SetTranslationDelegate(&delegate);
 }