Modernize more GoogleUpdateSettings functions.

use install_static in InitChannelInfo, SetEULAConsent, and
{Get,Set}ExperimentLables.

Also:
- changed EULA -> Eula in symbol names in chrome/installer.
- added support for testing both per-user and per-machine installs in
  GCAPIOmahaExperimentTest.

BUG=879568

Change-Id: I7676c7b75a9cb4cd3a85d1ba609d66a71581f05e
Reviewed-on: https://chromium-review.googlesource.com/1215024
Commit-Queue: Greg Thompson <grt@chromium.org>
Reviewed-by: Samuel Huang <huangs@chromium.org>
Cr-Commit-Position: refs/heads/master@{#590238}

chrome/browser/first_run/first_run_internal_win.cc

@@ -74,7 +74,7 @@ bool IsEULANotAccepted(installer::MasterPreferences* install_prefs) {
     base::FilePath eula_sentinel;
     // Be conservative and show the EULA if the path to the sentinel can't be
     // determined.
-    if (!InstallUtil::GetEULASentinelFilePath(&eula_sentinel) ||
+    if (!InstallUtil::GetEulaSentinelFilePath(&eula_sentinel) ||
         !base::PathExists(eula_sentinel)) {
       return true;
     }
@@ -95,9 +95,9 @@ bool WriteEULAtoTempFile(base::FilePath* eula_path) {
 // accepted.
 bool CreateEULASentinel() {
   base::FilePath eula_sentinel;
-  return InstallUtil::GetEULASentinelFilePath(&eula_sentinel) &&
-      base::CreateDirectory(eula_sentinel.DirName()) &&
-      base::WriteFile(eula_sentinel, "", 0) != -1;
+  return InstallUtil::GetEulaSentinelFilePath(&eula_sentinel) &&
+         base::CreateDirectory(eula_sentinel.DirName()) &&
+         base::WriteFile(eula_sentinel, "", 0) != -1;
 }
 
 }  // namespace

chrome/installer/gcapi/BUILD.gn

@@ -73,6 +73,7 @@ test("gcapi_test") {
     ":lib",
     "//base/test:test_support",
     "//chrome/install_static:install_static_util",
+    "//chrome/install_static/test:test_support",
     "//chrome/installer/util:with_no_strings",
     "//components/variations",
     "//testing/gtest",

chrome/installer/gcapi/DEPS

@@ -9,6 +9,7 @@ include_rules = [
 ]
 specific_include_rules = {
   ".*_test\.cc": [
+    "+chrome/install_static/test",
     "+chrome/installer/util",
   ]
 }

chrome/installer/gcapi/gcapi_omaha_experiment_test.cc

@@ -8,6 +8,7 @@
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/test/test_reg_util_win.h"
+#include "chrome/install_static/test/scoped_install_details.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
@@ -19,21 +20,26 @@ using base::ASCIIToUTF16;
 namespace {
 
 const wchar_t kBrand[] = L"ABCD";
-const uint16_t kUserLevel = GCAPI_INVOKED_STANDARD_SHELL;
 
 const wchar_t kSomeExperiments[] = L"myexp=1|Aug 2;yourexp=2|Sep 5";
 const wchar_t kSomeOtherExperiments[] = L"anotherexp=joe|Jun 7 2008";
 const wchar_t kSomeMoreExperiments[] = L"moreexp=foo|Jul 31 1999";
 
-class GCAPIOmahaExperimentTest : public ::testing::Test {
+// The boolean parameter is true for system-level tests, or false for user-level
+// tests.
+class GCAPIOmahaExperimentTest : public ::testing::TestWithParam<bool> {
  protected:
   GCAPIOmahaExperimentTest()
-      : brand_(kBrand),
+      : system_level_(GetParam()),
+        shell_mode_(system_level_ ? GCAPI_INVOKED_UAC_ELEVATION
+                                  : GCAPI_INVOKED_STANDARD_SHELL),
+        scoped_install_details_(system_level_),
         reactivation_label_(gcapi_internals::GetGCAPIExperimentLabel(
-            kBrand, gcapi_internals::kReactivationLabel)),
+            kBrand,
+            gcapi_internals::kReactivationLabel)),
         relaunch_label_(gcapi_internals::GetGCAPIExperimentLabel(
-            kBrand, gcapi_internals::kRelaunchLabel)) {
-  }
+            kBrand,
+            gcapi_internals::kRelaunchLabel)) {}
 
   void SetUp() override {
     ASSERT_NO_FATAL_FAILURE(
@@ -44,34 +50,37 @@ class GCAPIOmahaExperimentTest : public ::testing::Test {
 
   void VerifyExperimentLabels(const base::string16& expected_labels) {
     base::string16 actual_labels;
-    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(false,
-                                                           &actual_labels));
+    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(&actual_labels));
     EXPECT_EQ(expected_labels, actual_labels);
   }
 
+  int shell_mode() const { return shell_mode_; }
+
+  const bool system_level_;
+  const int shell_mode_;
+  const install_static::ScopedInstallDetails scoped_install_details_;
   registry_util::RegistryOverrideManager override_manager_;
-  base::string16 brand_;
   base::string16 reactivation_label_;
   base::string16 relaunch_label_;
 };
 
-TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelFromEmptyExperiments) {
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+TEST_P(GCAPIOmahaExperimentTest, SetReactivationLabelFromEmptyExperiments) {
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
   VerifyExperimentLabels(reactivation_label_);
 }
 
 // Test the relaunch label once; all other tests go more in depth, but since
 // both labels use the same logic underneath there is no need to test both in
 // depth.
-TEST_F(GCAPIOmahaExperimentTest, SetRelaunchLabelFromEmptyExperiments) {
-  ASSERT_TRUE(SetRelaunchExperimentLabels(kBrand, kUserLevel));
+TEST_P(GCAPIOmahaExperimentTest, SetRelaunchLabelFromEmptyExperiments) {
+  ASSERT_TRUE(SetRelaunchExperimentLabels(kBrand, shell_mode()));
   VerifyExperimentLabels(relaunch_label_);
 }
 
-TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
-  GoogleUpdateSettings::SetExperimentLabels(false, kSomeExperiments);
+TEST_P(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
+  GoogleUpdateSettings::SetExperimentLabels(kSomeExperiments);
 
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
 
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
@@ -79,16 +88,16 @@ TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
   VerifyExperimentLabels(expected_labels);
 }
 
-TEST_F(GCAPIOmahaExperimentTest,
+TEST_P(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithExistingIdenticalExperiment) {
   base::string16 previous_labels(kSomeExperiments);
   previous_labels += variations::kExperimentLabelSeparator;
   previous_labels.append(reactivation_label_);
   previous_labels += variations::kExperimentLabelSeparator;
   previous_labels.append(kSomeOtherExperiments);
-  GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
+  GoogleUpdateSettings::SetExperimentLabels(previous_labels);
 
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
 
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
@@ -98,14 +107,14 @@ TEST_F(GCAPIOmahaExperimentTest,
   VerifyExperimentLabels(expected_labels);
 }
 
-TEST_F(GCAPIOmahaExperimentTest,
+TEST_P(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithExistingIdenticalAtBeginning) {
   base::string16 previous_labels(reactivation_label_);
   previous_labels += variations::kExperimentLabelSeparator;
   previous_labels.append(kSomeExperiments);
-  GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
+  GoogleUpdateSettings::SetExperimentLabels(previous_labels);
 
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
 
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
@@ -113,7 +122,7 @@ TEST_F(GCAPIOmahaExperimentTest,
   VerifyExperimentLabels(expected_labels);
 }
 
-TEST_F(GCAPIOmahaExperimentTest,
+TEST_P(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithFakeMatchInAnExperiment) {
   base::string16 previous_labels(kSomeExperiments);
   previous_labels += variations::kExperimentLabelSeparator;
@@ -127,9 +136,9 @@ TEST_F(GCAPIOmahaExperimentTest,
   previous_labels.append(reactivation_label_);
   previous_labels += variations::kExperimentLabelSeparator;
   previous_labels.append(kSomeMoreExperiments);
-  GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
+  GoogleUpdateSettings::SetExperimentLabels(previous_labels);
 
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
 
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
@@ -144,7 +153,7 @@ TEST_F(GCAPIOmahaExperimentTest,
   VerifyExperimentLabels(expected_labels);
 }
 
-TEST_F(GCAPIOmahaExperimentTest,
+TEST_P(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithFakeMatchInAnExperimentAndNoRealMatch) {
   base::string16 previous_labels(kSomeExperiments);
   previous_labels += variations::kExperimentLabelSeparator;
@@ -153,9 +162,9 @@ TEST_F(GCAPIOmahaExperimentTest,
   previous_labels.append(reactivation_label_);
   previous_labels += variations::kExperimentLabelSeparator;
   previous_labels.append(kSomeOtherExperiments);
-  GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
+  GoogleUpdateSettings::SetExperimentLabels(previous_labels);
 
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
 
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
@@ -168,7 +177,7 @@ TEST_F(GCAPIOmahaExperimentTest,
   VerifyExperimentLabels(expected_labels);
 }
 
-TEST_F(GCAPIOmahaExperimentTest,
+TEST_P(GCAPIOmahaExperimentTest,
        SetReactivationLabelWithExistingEntryWithLabelAsPrefix) {
   base::string16 previous_labels(kSomeExperiments);
   previous_labels += variations::kExperimentLabelSeparator;
@@ -176,9 +185,9 @@ TEST_F(GCAPIOmahaExperimentTest,
   previous_labels.append(gcapi_internals::kReactivationLabel);
   // Shouldn't match deletion criteria.
   previous_labels.append(kSomeOtherExperiments);
-  GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
+  GoogleUpdateSettings::SetExperimentLabels(previous_labels);
 
-  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
+  ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, shell_mode()));
 
   base::string16 expected_labels(kSomeExperiments);
   expected_labels += variations::kExperimentLabelSeparator;
@@ -189,4 +198,6 @@ TEST_F(GCAPIOmahaExperimentTest,
   VerifyExperimentLabels(expected_labels);
 }
 
+INSTANTIATE_TEST_CASE_P(, GCAPIOmahaExperimentTest, ::testing::Bool());
+
 }  // namespace

chrome/installer/gcapi/gcapi_test.cc

@@ -6,6 +6,7 @@
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
+#include "chrome/install_static/test/scoped_install_details.h"
 #include "chrome/installer/gcapi/gcapi.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -63,6 +64,7 @@ const char kManualLaunchTests[] = "launch-chrome";
 int main(int argc, char* argv[]) {
   base::AtExitManager exit_manager;
   base::CommandLine::Init(argc, argv);
+  install_static::ScopedInstallDetails install_details;
 
   testing::InitGoogleTest(&argc, argv);
   RUN_ALL_TESTS();

chrome/installer/setup/setup_main.cc

@@ -691,7 +691,7 @@ installer::InstallStatus InstallProducts(
   return install_status;
 }
 
-installer::InstallStatus ShowEULADialog(const base::string16& inner_frame) {
+installer::InstallStatus ShowEulaDialog(const base::string16& inner_frame) {
   VLOG(1) << "About to show EULA";
   base::string16 eula_path = installer::GetLocalizedEulaResource();
   if (eula_path.empty()) {
@@ -716,9 +716,9 @@ installer::InstallStatus ShowEULADialog(const base::string16& inner_frame) {
 
 // Creates the sentinel indicating that the EULA was required and has been
 // accepted.
-bool CreateEULASentinel() {
+bool CreateEulaSentinel() {
   base::FilePath eula_sentinel;
-  if (!InstallUtil::GetEULASentinelFilePath(&eula_sentinel))
+  if (!InstallUtil::GetEulaSentinelFilePath(&eula_sentinel))
     return false;
 
   return (base::CreateDirectory(eula_sentinel.DirName()) &&
@@ -850,13 +850,11 @@ bool HandleNonInstallCmdLineOptions(const base::FilePath& setup_exe,
     // then the dialog is shown and regardless of the outcome setup exits here.
     base::string16 inner_frame =
         cmd_line.GetSwitchValueNative(installer::switches::kShowEula);
-    *exit_code = ShowEULADialog(inner_frame);
+    *exit_code = ShowEulaDialog(inner_frame);
 
     if (installer::EULA_REJECTED != *exit_code) {
-      if (GoogleUpdateSettings::SetEULAConsent(
-              *original_state, BrowserDistribution::GetDistribution(), true)) {
-        CreateEULASentinel();
-      }
+      if (GoogleUpdateSettings::SetEulaConsent(*original_state, true))
+        CreateEulaSentinel();
     }
   } else if (cmd_line.HasSwitch(installer::switches::kConfigureUserSettings)) {
     // NOTE: Should the work done here, on kConfigureUserSettings, change:

chrome/installer/util/experiment_storage.cc

@@ -383,10 +383,8 @@ base::string16 ExperimentStorage::EncodeMetrics(
 bool ExperimentStorage::LoadMetricsUnsafe(ExperimentMetrics* metrics) {
   base::string16 value;
 
-  if (!GoogleUpdateSettings::ReadExperimentLabels(
-          install_static::IsSystemInstall(), &value)) {
+  if (!GoogleUpdateSettings::ReadExperimentLabels(&value))
     return false;
-  }
 
   ExperimentLabels experiment_labels(value);
   base::StringPiece16 encoded_metrics =
@@ -401,18 +399,15 @@ bool ExperimentStorage::LoadMetricsUnsafe(ExperimentMetrics* metrics) {
 
 bool ExperimentStorage::StoreMetricsUnsafe(const ExperimentMetrics& metrics) {
   base::string16 value;
-  if (!GoogleUpdateSettings::ReadExperimentLabels(
-          install_static::IsSystemInstall(), &value)) {
+  if (!GoogleUpdateSettings::ReadExperimentLabels(&value))
     return false;
-  }
   ExperimentLabels experiment_labels(value);
 
   experiment_labels.SetValueForLabel(kExperimentLabelName,
                                      EncodeMetrics(metrics),
                                      base::TimeDelta::FromDays(182));
 
-  return GoogleUpdateSettings::SetExperimentLabels(
-      install_static::IsSystemInstall(), experiment_labels.value());
+  return GoogleUpdateSettings::SetExperimentLabels(experiment_labels.value());
 }
 
 bool ExperimentStorage::LoadStateUnsafe(Experiment* experiment) {

chrome/installer/util/google_update_constants.cc

@@ -34,7 +34,7 @@ const wchar_t kRegClientField[] = L"client";
 const wchar_t kRegCommandLineField[] = L"CommandLine";
 const wchar_t kRegCriticalVersionField[] = L"cpv";
 const wchar_t kRegDidRunField[] = L"dr";
-const wchar_t kRegEULAAceptedField[] = L"eulaaccepted";
+const wchar_t kRegEulaAceptedField[] = L"eulaaccepted";
 const wchar_t kRegGoogleUpdateVersion[] = L"version";
 const wchar_t kRegInstallerProgress[] = L"InstallerProgress";
 const wchar_t kRegLangField[] = L"lang";

chrome/installer/util/google_update_constants.h

@@ -50,7 +50,7 @@ extern const wchar_t kRegClientField[];
 extern const wchar_t kRegCommandLineField[];
 extern const wchar_t kRegCriticalVersionField[];
 extern const wchar_t kRegDidRunField[];
-extern const wchar_t kRegEULAAceptedField[];
+extern const wchar_t kRegEulaAceptedField[];
 extern const wchar_t kRegGoogleUpdateVersion[];
 extern const wchar_t kRegInstallerProgress[];
 extern const wchar_t kRegLangField[];

chrome/installer/util/google_update_settings.cc

@@ -191,8 +191,7 @@ bool RemoveUserGoogleUpdateStrKey(const wchar_t* const name) {
 bool InitChannelInfo(bool system_install,
                      installer::ChannelInfo* channel_info) {
   HKEY root_key = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  RegKey key(root_key, dist->GetStateKey().c_str(),
+  RegKey key(root_key, install_static::GetClientStateKeyPath().c_str(),
              KEY_QUERY_VALUE | KEY_WOW64_32KEY);
   return channel_info->Initialize(key);
 }
@@ -368,11 +367,9 @@ void GoogleUpdateSettings::StoreMetricsClientInfo(
 }
 
 // EULA consent is only relevant for system-level installs.
-bool GoogleUpdateSettings::SetEULAConsent(
+bool GoogleUpdateSettings::SetEulaConsent(
     const InstallationState& machine_state,
-    BrowserDistribution* dist,
     bool consented) {
-  DCHECK(dist);
   const DWORD eula_accepted = consented ? 1 : 0;
   const REGSAM kAccess = KEY_SET_VALUE | KEY_WOW64_32KEY;
   RegKey key;
@@ -381,7 +378,7 @@ bool GoogleUpdateSettings::SetEULAConsent(
   return key.Create(HKEY_LOCAL_MACHINE,
                     install_static::GetClientStateMediumKeyPath().c_str(),
                     kAccess) == ERROR_SUCCESS &&
-         key.WriteValue(google_update::kRegEULAAceptedField, eula_accepted) ==
+         key.WriteValue(google_update::kRegEulaAceptedField, eula_accepted) ==
              ERROR_SUCCESS;
 }
 
@@ -855,16 +852,13 @@ bool GoogleUpdateSettings::GetUpdateDetail(ProductData* data) {
 }
 
 bool GoogleUpdateSettings::SetExperimentLabels(
-    bool system_install,
     const base::string16& experiment_labels) {
-  HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-  // Use the browser distribution and install level to write to the correct
-  // client state/app guid key.
-  bool success = false;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  const bool system_install = install_static::IsSystemInstall();
+  const HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
+  // Use install level to write to the correct client state/app guid key.
   base::string16 client_state_path(
       system_install ? install_static::GetClientStateMediumKeyPath()
-                     : dist->GetStateKey());
+                     : install_static::GetClientStateKeyPath());
   RegKey client_state(reg_root, client_state_path.c_str(),
                       KEY_SET_VALUE | KEY_WOW64_32KEY);
   // It is possible that the registry keys do not yet exist or have not yet
@@ -872,25 +866,20 @@ bool GoogleUpdateSettings::SetExperimentLabels(
   if (!client_state.Valid())
     return false;
   if (experiment_labels.empty()) {
-    success = client_state.DeleteValue(google_update::kExperimentLabels) ==
-              ERROR_SUCCESS;
-  } else {
-    success =
-        client_state.WriteValue(google_update::kExperimentLabels,
-                                experiment_labels.c_str()) == ERROR_SUCCESS;
+    return client_state.DeleteValue(google_update::kExperimentLabels) ==
+           ERROR_SUCCESS;
   }
-
-  return success;
+  return client_state.WriteValue(google_update::kExperimentLabels,
+                                 experiment_labels.c_str()) == ERROR_SUCCESS;
 }
 
 bool GoogleUpdateSettings::ReadExperimentLabels(
-    bool system_install,
     base::string16* experiment_labels) {
-  HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
+  const bool system_install = install_static::IsSystemInstall();
+  const HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   base::string16 client_state_path(
       system_install ? install_static::GetClientStateMediumKeyPath()
-                     : dist->GetStateKey());
+                     : install_static::GetClientStateKeyPath());
 
   RegKey client_state;
   LONG result = client_state.Open(

chrome/installer/util/google_update_settings.h

@@ -24,7 +24,6 @@
 #include "components/metrics/client_info.h"
 
 class AppRegistrationData;
-class BrowserDistribution;
 
 namespace installer {
 class ChannelInfo;
@@ -133,8 +132,7 @@ class GoogleUpdateSettings {
 
   // Sets the machine-wide EULA consented flag required on OEM installs.
   // Returns false if the setting could not be recorded.
-  static bool SetEULAConsent(const installer::InstallationState& machine_state,
-                             BrowserDistribution* dist,
+  static bool SetEulaConsent(const installer::InstallationState& machine_state,
                              bool consented);
 
   // Returns the last time chrome was run in days. It uses a recorded value
@@ -300,26 +298,23 @@ class GoogleUpdateSettings {
   static bool GetUpdateDetailForGoogleUpdate(ProductData* data);
 
   // Returns product data for the current product. (Equivalent to calling
-  // GetUpdateDetailForApp with the app guid stored in BrowserDistribution.)
+  // GetUpdateDetailForApp with the current install mode's app guid.)
   static bool GetUpdateDetail(ProductData* data);
 
   // Sets |experiment_labels| as the Google Update experiment_labels value in
   // the ClientState key for this Chrome product, if appropriate. If
   // |experiment_labels| is empty, this will delete the value instead. This will
   // return true if the label was successfully set (or deleted), false otherwise
-  // (even if the label does not need to be set for this particular distribution
-  // type).
-  static bool SetExperimentLabels(bool system_install,
-                                  const base::string16& experiment_labels);
+  // (even if the label does not need to be set for this particular brand).
+  static bool SetExperimentLabels(const base::string16& experiment_labels);
 
   // Reads the Google Update experiment_labels value in the ClientState key for
   // this Chrome product and writes it into |experiment_labels|. If the key or
   // value does not exist, |experiment_labels| will be set to the empty string.
-  // If this distribution of Chrome does not set the experiment_labels value,
-  // this will do nothing to |experiment_labels|. This will return true if the
-  // label did not exist, or was successfully read.
-  static bool ReadExperimentLabels(bool system_install,
-                                   base::string16* experiment_labels);
+  // If this brand does not set the experiment_labels value, this will do
+  // nothing to |experiment_labels|. This will return true if the label did not
+  // exist, or was successfully read.
+  static bool ReadExperimentLabels(base::string16* experiment_labels);
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);

chrome/installer/util/google_update_settings_unittest.cc

@@ -70,12 +70,11 @@ class GoogleUpdateSettingsTest : public testing::Test {
     base::string16 value;
     // Before anything is set, ReadExperimentLabels should succeed but return
     // an empty string.
-    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
-        install == SYSTEM_INSTALL, &value));
+    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(&value));
     EXPECT_EQ(base::string16(), value);
 
-    EXPECT_TRUE(GoogleUpdateSettings::SetExperimentLabels(
-        install == SYSTEM_INSTALL, kTestExperimentLabel));
+    EXPECT_TRUE(
+        GoogleUpdateSettings::SetExperimentLabels(kTestExperimentLabel));
 
     // Validate that something is written. Only worry about the label itself.
     RegKey key;
@@ -92,21 +91,18 @@ class GoogleUpdateSettingsTest : public testing::Test {
     EXPECT_EQ(ERROR_SUCCESS,
         key.ReadValue(google_update::kExperimentLabels, &value));
     EXPECT_EQ(kTestExperimentLabel, value);
-    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
-        install == SYSTEM_INSTALL, &value));
+    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(&value));
     EXPECT_EQ(kTestExperimentLabel, value);
     key.Close();
 
     // Now that the label is set, test the delete functionality. An empty label
     // should result in deleting the value.
-    EXPECT_TRUE(GoogleUpdateSettings::SetExperimentLabels(
-        install == SYSTEM_INSTALL, base::string16()));
+    EXPECT_TRUE(GoogleUpdateSettings::SetExperimentLabels(base::string16()));
     EXPECT_EQ(ERROR_SUCCESS,
               key.Open(root, state_key.c_str(), KEY_QUERY_VALUE));
     EXPECT_EQ(ERROR_FILE_NOT_FOUND,
         key.ReadValue(google_update::kExperimentLabels, &value));
-    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
-        install == SYSTEM_INSTALL, &value));
+    EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(&value));
     EXPECT_EQ(base::string16(), value);
     key.Close();
   }
@@ -408,7 +404,7 @@ TEST_F(GoogleUpdateSettingsTest, UpdateInstallStatusTest) {
   }
 }
 
-TEST_F(GoogleUpdateSettingsTest, SetEULAConsent) {
+TEST_F(GoogleUpdateSettingsTest, SetEulaConsent) {
   using installer::FakeInstallationState;
 
   const bool system_level = true;
@@ -420,17 +416,15 @@ TEST_F(GoogleUpdateSettingsTest, SetEULAConsent) {
 
   RegKey key;
   DWORD value;
-  BrowserDistribution* chrome = BrowserDistribution::GetDistribution();
 
   // eulaconsent is set on the product.
-  EXPECT_TRUE(GoogleUpdateSettings::SetEULAConsent(machine_state, chrome,
-                                                   true));
+  EXPECT_TRUE(GoogleUpdateSettings::SetEulaConsent(machine_state, true));
   EXPECT_EQ(ERROR_SUCCESS,
             key.Open(HKEY_LOCAL_MACHINE,
                      install_static::GetClientStateMediumKeyPath().c_str(),
                      KEY_QUERY_VALUE));
   EXPECT_EQ(ERROR_SUCCESS,
-      key.ReadValueDW(google_update::kRegEULAAceptedField, &value));
+            key.ReadValueDW(google_update::kRegEulaAceptedField, &value));
   EXPECT_EQ(1U, value);
 }
 

chrome/installer/util/install_util.cc

@@ -407,11 +407,11 @@ base::string16 InstallUtil::GetToastActivatorRegistryPath() {
 }
 
 // static
-bool InstallUtil::GetEULASentinelFilePath(base::FilePath* path) {
+bool InstallUtil::GetEulaSentinelFilePath(base::FilePath* path) {
   base::FilePath user_data_dir;
   if (!base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir))
     return false;
-  *path = user_data_dir.Append(installer::kEULASentinelFile);
+  *path = user_data_dir.Append(installer::kEulaSentinelFile);
   return true;
 }
 

chrome/installer/util/install_util.h

@@ -86,7 +86,7 @@ class InstallUtil {
   static base::string16 GetToastActivatorRegistryPath();
 
   // Populates |path| with EULA sentinel file path. Returns false on error.
-  static bool GetEULASentinelFilePath(base::FilePath* path);
+  static bool GetEulaSentinelFilePath(base::FilePath* path);
 
   // Deletes the registry key at path key_path under the key given by root_key.
   static bool DeleteRegistryKey(HKEY root_key,

chrome/installer/util/installation_state.cc

@@ -111,7 +111,7 @@ bool ProductState::Initialize(bool system_install) {
     has_oem_install_ = (key.ReadValue(google_update::kRegOemInstallField,
                                       &oem_install_) == ERROR_SUCCESS);
     // "eulaaccepted" may be absent, 0 or 1.
-    has_eula_accepted_ = (key.ReadValueDW(google_update::kRegEULAAceptedField,
+    has_eula_accepted_ = (key.ReadValueDW(google_update::kRegEulaAceptedField,
                                           &eula_accepted_) == ERROR_SUCCESS);
     // "msi" may be absent, 0 or 1
     DWORD dw_value = 0;
@@ -135,8 +135,8 @@ bool ProductState::Initialize(bool system_install) {
       usagestats_ = dword_value;
     }
 
-    if (key.ReadValueDW(google_update::kRegEULAAceptedField,
-                        &dword_value) == ERROR_SUCCESS) {
+    if (key.ReadValueDW(google_update::kRegEulaAceptedField, &dword_value) ==
+        ERROR_SUCCESS) {
       has_eula_accepted_ = true;
       eula_accepted_ = dword_value;
     }

chrome/installer/util/util_constants.cc

@@ -192,7 +192,7 @@ const wchar_t kChromeNewExe[] = L"new_chrome.exe";
 const wchar_t kChromeOldExe[] = L"old_chrome.exe";
 const wchar_t kCmdOnOsUpgrade[] = L"on-os-upgrade";
 const wchar_t kCmdStoreDMToken[] = L"store-dmtoken";
-const wchar_t kEULASentinelFile[] = L"EULA Accepted";
+const wchar_t kEulaSentinelFile[] = L"EULA Accepted";
 const wchar_t kInstallBinaryDir[] = L"Application";
 const wchar_t kInstallerDir[] = L"Installer";
 const wchar_t kInstallTempDir[] = L"Temp";

chrome/installer/util/util_constants.h

@@ -205,7 +205,7 @@ extern const wchar_t kChromeNewExe[];
 extern const wchar_t kChromeOldExe[];
 extern const wchar_t kCmdOnOsUpgrade[];
 extern const wchar_t kCmdStoreDMToken[];
-extern const wchar_t kEULASentinelFile[];
+extern const wchar_t kEulaSentinelFile[];
 extern const wchar_t kInstallBinaryDir[];
 extern const wchar_t kInstallerDir[];
 extern const wchar_t kInstallTempDir[];