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

chrome/install_static/install_details.h

 // Copyright 2016 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.
 
 #ifndef CHROME_INSTALL_STATIC_INSTALL_DETAILS_H_
 #define CHROME_INSTALL_STATIC_INSTALL_DETAILS_H_
 
 #include <memory>
 #include <string>
 
@@ skipping 31 matching lines @@
     // The brand-specific install mode for this install; see kInstallModes.
     const InstallConstants* mode;
 
     // The friendly name of this Chrome's channel, or an empty string if the
     // brand does not integrate with Google Update.
     const wchar_t* channel;
 
     // The string length of |channel| (not including the string terminator).
     size_t channel_length;
 
+    // The "ap" (additional parameters) value read from Chrome's ClientState key
+    // during process startup.
+    const wchar_t* update_ap;
+
+    // The "name" value read from Chrome's ClientState\cohort key during process
+    // startup.
+    const wchar_t* update_cohort_name;
+
     // True if installed in C:\Program Files{, {x86)}; otherwise, false.
     bool system_level;
   };
 
   InstallDetails(const InstallDetails&) = delete;
   InstallDetails(InstallDetails&&) = delete;
   InstallDetails& operator=(const InstallDetails&) = delete;
   virtual ~InstallDetails() = default;
 
   // Returns the instance for this module.
@@ skipping 57 matching lines @@
   // Returns the resource id of this mode's main application icon.
   int32_t app_icon_resource_id() const {
     return payload_->mode->app_icon_resource_id;
   }
 
   // The install's update channel, or an empty string if the brand does not
   // integrate with Google Update.
   std::wstring channel() const {
     return std::wstring(payload_->channel, payload_->channel_length);
   }
+
+  // Returns the "ap" (additional parameters) value read from Chrome's
+  // ClientState key during process startup.
+  std::wstring update_ap() const {
+    return payload_->update_ap ? std::wstring(payload_->update_ap)
+                               : std::wstring();
+  }
+
+  // Returns the "name" value read from Chrome's ClientState\cohort key during
+  // process startup.
+  std::wstring update_cohort_name() const {
+    return payload_->update_cohort_name
+               ? std::wstring(payload_->update_cohort_name)
+               : std::wstring();
+  }
+
   bool system_level() const { return payload_->system_level; }
 
   // Returns the path to the installation's ClientState registry key. This
   // registry key is used to hold various installation-related values, including
   // an indication of consent for usage stats.
   std::wstring GetClientStateKeyPath() const;
 
   // Returns the path to the installation's ClientStateMedium registry key. This
   // registry key is used to hold various installation-related values, including
   // an indication of consent for usage stats for a system-level install.
@@ skipping 43 matching lines @@
   PrimaryInstallDetails(const PrimaryInstallDetails&) = delete;
   PrimaryInstallDetails(PrimaryInstallDetails&&) = delete;
   PrimaryInstallDetails& operator=(const PrimaryInstallDetails&) = delete;
 
   void set_mode(const InstallConstants* mode) { payload_.mode = mode; }
   void set_channel(const std::wstring& channel) {
     channel_ = channel;
     payload_.channel = channel_.c_str();
     payload_.channel_length = channel_.size();
   }
+  void set_update_ap(const std::wstring& update_ap) {
+    update_ap_ = update_ap;
+    payload_.update_ap = update_ap_.c_str();
+  }
+  void set_update_cohort_name(const std::wstring& update_cohort_name) {
+    update_cohort_name_ = update_cohort_name;
+    payload_.update_cohort_name = update_cohort_name_.c_str();
+  }
   void set_system_level(bool system_level) {
     payload_.system_level = system_level;
   }
 
  private:
   std::wstring channel_;
+  std::wstring update_ap_;
+  std::wstring update_cohort_name_;
   Payload payload_ = Payload();
 };
 
 }  // namespace install_static
 
 #endif  // CHROME_INSTALL_STATIC_INSTALL_DETAILS_H_