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

chrome/install_static/product_install_details_unittest.cc

 // 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.
 
 #include "chrome/install_static/product_install_details.h"
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 177 matching lines @@
 
   const TestData& test_data() const { return test_data_; }
 
   void SetAp(const wchar_t* value) {
     ASSERT_THAT(base::win::RegKey(root_key_, GetClientStateKeyPath().c_str(),
                                   KEY_WOW64_32KEY | KEY_SET_VALUE)
                     .WriteValue(L"ap", value),
                 Eq(ERROR_SUCCESS));
   }
 
+  void SetCohortName(const wchar_t* value) {
+    ASSERT_THAT(
+        base::win::RegKey(root_key_,
+                          GetClientStateKeyPath().append(L"\\cohort").c_str(),
+                          KEY_WOW64_32KEY | KEY_SET_VALUE)
+            .WriteValue(L"name", value),
+        Eq(ERROR_SUCCESS));
+  }
+
  private:
   // Returns the registry path for the product's ClientState key.
   std::wstring GetClientStateKeyPath() {
     std::wstring result(L"Software\\");
     if (kUseGoogleUpdateIntegration) {
       result.append(L"Google\\Update\\ClientState\\");
       result.append(kInstallModes[test_data().index].app_guid);
     } else {
       result.append(kProductPathName);
     }
@@ skipping 75 matching lines @@
     if (kInstallModes[test_data().index].channel_strategy ==
         ChannelStrategy::ADDITIONAL_PARAMETERS) {
       EXPECT_THAT(details->channel(), StrEq(ap_and_channel.second));
     } else {
       // "ap" is ignored for this mode.
       EXPECT_THAT(details->channel(), StrEq(test_data().channel));
     }
   }
 }
 
+// Test that the "ap" value is cached during initialization.
+TEST_P(MakeProductDetailsTest, UpdateAp) {
+  // This test is only valid for brands that integrate with Google Update.
+  if (!kUseGoogleUpdateIntegration)
+    return;
+
+  // With no value in the registry, the ap value should be empty.
+  {
+    std::unique_ptr<PrimaryInstallDetails> details(
+        MakeProductDetails(test_data().path));
+    EXPECT_THAT(details->update_ap(), StrEq(L""));
+  }
+
+  // And with a value, it should have ... the value.
+  static constexpr wchar_t kCrookedMoon[] = L"CrookedMoon";
+  SetAp(kCrookedMoon);
+  {
+    std::unique_ptr<PrimaryInstallDetails> details(
+        MakeProductDetails(test_data().path));
+    EXPECT_THAT(details->update_ap(), StrEq(kCrookedMoon));
+  }
+}
+
+// Test that the cohort name is cached during initialization.
+TEST_P(MakeProductDetailsTest, UpdateCohortName) {
+  // This test is only valid for brands that integrate with Google Update.
+  if (!kUseGoogleUpdateIntegration)
+    return;
+
+  // With no value in the registry, the cohort name should be empty.
+  {
+    std::unique_ptr<PrimaryInstallDetails> details(
+        MakeProductDetails(test_data().path));
+    EXPECT_THAT(details->update_cohort_name(), StrEq(L""));
+  }
+
+  // And with a value, it should have ... the value.
+  static constexpr wchar_t kPhony[] = L"Phony";
+  SetCohortName(kPhony);
+  {
+    std::unique_ptr<PrimaryInstallDetails> details(
+        MakeProductDetails(test_data().path));
+    EXPECT_THAT(details->update_cohort_name(), StrEq(kPhony));
+  }
+}
+
 INSTANTIATE_TEST_CASE_P(All,
                         MakeProductDetailsTest,
                         testing::ValuesIn(kTestData));
 
 }  // namespace install_static