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

chrome/browser/ui/webui/version_ui.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/ui/webui/version_ui.h"
 
 #include "base/command_line.h"
 #include "base/i18n/message_formatter.h"
 #include "base/memory/ptr_util.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/version_handler.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/browser_resources.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/install_static/install_details.h"
 #include "components/grit/components_resources.h"
 #include "components/strings/grit/components_chromium_strings.h"
 #include "components/strings/grit/components_strings.h"
 #include "components/version_info/version_info.h"
 #include "components/version_ui/version_ui_constants.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/user_agent.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 119 matching lines @@
 #if BUILDFLAG(PGO_BUILD)
   html_source->AddString(version_ui::kCompiler, "MSVC 2017 (PGO)");
 #else
   html_source->AddString(version_ui::kCompiler, "MSVC 2017");
 #endif
 #elif defined(_MSC_VER)
 #error "Unsupported version of MSVC."
 #else
   html_source->AddString(version_ui::kCompiler, "Unknown");
 #endif
 #endif  // defined(OS_WIN)

[scottmg, 2017/04/03 18:02:54]

Can just merge the new #if with this one.

[grt (UTC plus 2), 2017/04/03 19:54:33]

Done.

 
+#if defined(OS_WIN)
+  base::string16 update_cohort_name =
+      install_static::InstallDetails::Get().update_cohort_name();
+  if (!update_cohort_name.empty()) {
+    html_source->AddString(version_ui::kUpdateCohortName,
+                           l10n_util::GetStringFUTF16(
+                               IDS_VERSION_UI_COHORT_NAME, update_cohort_name));
+  }
+#endif  // defined(OS_WIN)
+
   html_source->SetJsonPath("strings.js");
   html_source->AddResourcePath(version_ui::kVersionJS, IDR_VERSION_UI_JS);
   html_source->AddResourcePath(version_ui::kAboutVersionCSS,
                                IDR_VERSION_UI_CSS);
   html_source->SetDefaultResource(IDR_VERSION_UI_HTML);
   return html_source;
 }
 
 }  // namespace
 
@@ skipping 11 matching lines @@
   // Set up the chrome://theme/ source.
   ThemeSource* theme = new ThemeSource(profile);
   content::URLDataSource::Add(profile, theme);
 #endif
 
   WebUIDataSource::Add(profile, CreateVersionUIDataSource());
 }
 
 VersionUI::~VersionUI() {
 }