Clean Read/SetExperimentLabels to remove check for Chrome build.

chrome/installer/util/google_update_settings_unittest.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/installer/util/google_update_settings.h"
 
 #include <windows.h>
 #include <shlwapi.h>  // For SHDeleteKey.
 #include <stddef.h>
 
@@ skipping 21 matching lines @@
 #include "chrome/installer/util/work_item_list.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::win::RegKey;
 using installer::ChannelInfo;
 
 namespace {
 
 const wchar_t kTestProductGuid[] = L"{89F1B351-B15D-48D4-8F10-1298721CF13D}";
 
-#if defined(GOOGLE_CHROME_BUILD)
 const wchar_t kTestExperimentLabel[] = L"test_label_value";
-#endif
 
 // This test fixture redirects the HKLM and HKCU registry hives for
 // the duration of the test to make it independent of the machine
 // and user settings.
 class GoogleUpdateSettingsTest : public testing::Test {
  protected:
   enum SystemUserInstall {
     SYSTEM_INSTALL,
     USER_INSTALL,
   };
 
   GoogleUpdateSettingsTest()
       : program_files_override_(base::DIR_PROGRAM_FILES),
         program_files_x86_override_(base::DIR_PROGRAM_FILESX86) {}
 
   void SetUp() override {
     ASSERT_NO_FATAL_FAILURE(
         registry_overrides_.OverrideRegistry(HKEY_LOCAL_MACHINE));
     ASSERT_NO_FATAL_FAILURE(
         registry_overrides_.OverrideRegistry(HKEY_CURRENT_USER));
   }
 
   // Test the writing and deleting functionality of the experiments label
   // helper.
   void TestExperimentsLabelHelper(SystemUserInstall install) {
     // Install a basic InstallDetails instance.
     install_static::ScopedInstallDetails details(install == SYSTEM_INSTALL);
 
     base::string16 value;
-#if defined(GOOGLE_CHROME_BUILD)
     // Before anything is set, ReadExperimentLabels should succeed but return
     // an empty string.
     EXPECT_TRUE(GoogleUpdateSettings::ReadExperimentLabels(
         install == SYSTEM_INSTALL, &value));
     EXPECT_EQ(base::string16(), value);
 
     EXPECT_TRUE(GoogleUpdateSettings::SetExperimentLabels(
         install == SYSTEM_INSTALL, kTestExperimentLabel));
 
     // Validate that something is written. Only worry about the label itself.
@@ skipping 19 matching lines @@
     EXPECT_TRUE(GoogleUpdateSettings::SetExperimentLabels(
         install == SYSTEM_INSTALL, 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_EQ(base::string16(), value);
     key.Close();
-#else
-    EXPECT_FALSE(GoogleUpdateSettings::ReadExperimentLabels(
-        install == SYSTEM_INSTALL, &value));
-#endif  // GOOGLE_CHROME_BUILD
   }
 
   // Creates "ap" key with the value given as parameter. Also adds work
   // items to work_item_list given so that they can be rolled back later.
   bool CreateApKey(WorkItemList* work_item_list, const base::string16& value) {
     HKEY reg_root = HKEY_CURRENT_USER;
     base::string16 reg_key = GetApKeyPath();
     work_item_list->AddCreateRegKeyWorkItem(
         reg_root, reg_key, WorkItem::kWow64Default);
     work_item_list->AddSetRegValueWorkItem(reg_root,
@@ skipping 645 matching lines @@
   EXPECT_TRUE(GoogleUpdateSettings::AreAutoupdatesEnabled());
 
   // Set the update period to something unreasonable.
   EXPECT_TRUE(SetUpdateTimeoutOverride(
       GoogleUpdateSettings::kCheckPeriodOverrideMinutesMax + 1));
   EXPECT_FALSE(GoogleUpdateSettings::AreAutoupdatesEnabled());
   EXPECT_TRUE(GoogleUpdateSettings::ReenableAutoupdates());
   EXPECT_TRUE(GoogleUpdateSettings::AreAutoupdatesEnabled());
 }
 
+#endif  // defined(GOOGLE_CHROME_BUILD)
+
 TEST_F(GoogleUpdateSettingsTest, ExperimentsLabelHelperSystem) {
   TestExperimentsLabelHelper(SYSTEM_INSTALL);
 }
 
 TEST_F(GoogleUpdateSettingsTest, ExperimentsLabelHelperUser) {
   TestExperimentsLabelHelper(USER_INSTALL);
 }
 
-#endif  // defined(GOOGLE_CHROME_BUILD)
-
 TEST_F(GoogleUpdateSettingsTest, GetDownloadPreference) {
   RegKey policy_key;
 
   if (policy_key.Open(HKEY_LOCAL_MACHINE, GoogleUpdateSettings::kPoliciesKey,
                       KEY_SET_VALUE) == ERROR_SUCCESS) {
     policy_key.DeleteValue(
         GoogleUpdateSettings::kDownloadPreferencePolicyValue);
   }
   policy_key.Close();
 
@@ skipping 373 matching lines @@
                                  StatsState::TRUE_SETTING),
                       StatsState(StatsState::kSystemLevel,
                                  StatsState::TRUE_SETTING,
                                  StatsState::NO_SETTING),
                       StatsState(StatsState::kSystemLevel,
                                  StatsState::TRUE_SETTING,
                                  StatsState::FALSE_SETTING),
                       StatsState(StatsState::kSystemLevel,
                                  StatsState::TRUE_SETTING,
                                  StatsState::TRUE_SETTING)));