Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2411)

Unified Diff: chrome/installer/util/google_update_settings.cc

Issue 2919963002: Clean Read/SetExperimentLabels to remove check for Chrome build. (Closed)
Patch Set: Fix includes in chrome_variations_service_client.cc Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/installer/util/google_update_settings.cc
diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc
index c1433d5b9f9379c731033bc43f82c6fd80ff3b92..d7f4423ac9d65a392484892e73c4a6fa1df61712 100644
--- a/chrome/installer/util/google_update_settings.cc
+++ b/chrome/installer/util/google_update_settings.cc
@@ -851,13 +851,7 @@ bool GoogleUpdateSettings::GetUpdateDetail(ProductData* 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;
@@ -885,11 +879,6 @@ bool GoogleUpdateSettings::SetExperimentLabels(
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(

Powered by Google App Engine
This is Rietveld 408576698