| 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..a4ce436ac37af882eb4f9267d2ab2eb3183c2ad8 100644
|
| --- a/chrome/browser/chrome_browser_main.cc
|
| +++ b/chrome/browser/chrome_browser_main.cc
|
| @@ -633,6 +633,16 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {
|
| CHECK(result) << "Invalid --" << switches::kForceFieldTrials
|
| << " list specified.";
|
| }
|
| +
|
| +#if !defined(GOOGLE_CHROME_BUILD)
|
| + if (!command_line->HasSwitch(switches::kDisableFieldTrialTestingConfig) &&
|
| + !command_line->HasSwitch(switches::kForceFieldTrials) &&
|
| + !command_line->HasSwitch(switches::kVariationsServerURL)) {
|
| + bool result = chrome_variations::AssociateDefaultFieldTrialConfig();
|
| + CHECK(result) << " Enabling field trial testing configuration failed.";
|
| + }
|
| +#endif // !defined(GOOGLE_CHROME_BUILD)
|
| +
|
| if (command_line->HasSwitch(switches::kForceVariationIds)) {
|
| // Create default variation ids which will always be included in the
|
| // X-Client-Data request header.
|
|
|