Clean Read/SetExperimentLabels to remove check for Chrome build.

chrome/installer/util/google_update_settings.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 <stdint.h>
 
 #include <algorithm>
 
@@ skipping 833 matching lines @@
 }
 
 bool GoogleUpdateSettings::GetUpdateDetail(ProductData* data) {
   return GetUpdateDetailForApp(!InstallUtil::IsPerUserInstall(),
                                install_static::GetAppGuid(), data);
 }
 
 bool GoogleUpdateSettings::SetExperimentLabels(
     bool system_install,
     const base::string16& experiment_labels) {
-  // There is nothing to do if this brand does not support integration with
-  // Google Update.
-  if (!install_static::kUseGoogleUpdateIntegration)
-    return false;
-
   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();
   base::string16 client_state_path(system_install ? dist->GetStateMediumKey()
                                                   : dist->GetStateKey());
   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
   // been ACLed by Google Update to be user writable.
   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 success;
 }
 
 bool GoogleUpdateSettings::ReadExperimentLabels(
     bool system_install,
     base::string16* experiment_labels) {
-  // There is nothing to do if this brand does not support integration with
-  // Google Update.
-  if (!install_static::kUseGoogleUpdateIntegration)
-    return false;
-
   HKEY reg_root = system_install ? HKEY_LOCAL_MACHINE : HKEY_CURRENT_USER;
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   base::string16 client_state_path(
       system_install ? dist->GetStateMediumKey() : dist->GetStateKey());
 
   RegKey client_state;
   LONG result = client_state.Open(
       reg_root, client_state_path.c_str(), KEY_QUERY_VALUE | KEY_WOW64_32KEY);
   if (result == ERROR_SUCCESS) {
     result = client_state.ReadValue(google_update::kExperimentLabels,
                                     experiment_labels);
   }
 
   // If the key or value was not present, return the empty string.
   if (result == ERROR_FILE_NOT_FOUND || result == ERROR_PATH_NOT_FOUND) {
     experiment_labels->clear();
     return true;
   }
 
   return result == ERROR_SUCCESS;
 }