Index: chrome/browser/chrome_browser_main.cc |
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc |
index b1cfe0b6d89997f4e84d4136827d74d16974ed71..589e97a1cc9952be6b04b90b7e150730bd67d75b 100644 |
--- a/chrome/browser/chrome_browser_main.cc |
+++ b/chrome/browser/chrome_browser_main.cc |
@@ -633,6 +633,21 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() { |
CHECK(result) << "Invalid --" << switches::kForceFieldTrials |
<< " list specified."; |
} |
+ |
+#if defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD) |
Alexei Svitkine (slow)
2015/07/10 19:22:30
I think OFFICIAL_BUILD is not needed here. I think
danduong
2015/07/10 19:36:56
Hmm... If we were to do this, would I still be abl
brettw
2015/07/10 19:41:21
Yeah, I always get these confused but "chrome_buil
Alexei Svitkine (slow)
2015/07/10 19:44:41
Interesting. I had assumed that's not really a use
danduong
2015/07/10 23:02:36
I guess that would be a lesser use-case. For simpl
|
+ std::string enable_field_trial_testing = command_line->GetSwitchValueASCII( |
+ switches::kEnableFieldTrialTestingConfig); |
Alexei Svitkine (slow)
2015/07/10 19:22:29
Convention for switches that start with "enable_*"
danduong
2015/07/10 19:36:56
I can add a check for the variations server stuff.
Alexei Svitkine (slow)
2015/07/10 19:44:41
Right... I remember now - because the perf bots ac
danduong
2015/07/10 23:02:35
Yup. Let's simplify with just using a disable flag
|
+ if (enable_field_trial_testing.empty()) { |
brettw
2015/07/10 19:41:21
No {} one one-line conditionals for consistency.
danduong
2015/07/10 23:02:36
Removed this piece of code altogether.
|
+ enable_field_trial_testing = "1"; |
+ } |
+ |
+ if (enable_field_trial_testing == "1" && |
+ !command_line->HasSwitch(switches::kForceFieldTrials)) { |
+ bool result = chrome_variations::AssociateDefaultFieldTrialConfig(); |
+ CHECK(result) << " Enabling field trial testing configuration failed."; |
+ } |
+#endif // defined(GOOGLE_CHROME_BUILD) && defined(OFFICIAL_BUILD) |
+ |
if (command_line->HasSwitch(switches::kForceVariationIds)) { |
// Create default variation ids which will always be included in the |
// X-Client-Data request header. |