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

Unified Diff: ios/chrome/browser/ios_chrome_main_parts.mm

Issue 2480203002: ui: Cleanup class/struct forward declarations (Closed)
Patch Set: Sync CL to position 430550 Created 4 years, 1 month 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
« no previous file with comments | « ios/chrome/browser/BUILD.gn ('k') | ios/chrome/browser/net/crl_set_fetcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/ios_chrome_main_parts.mm
diff --git a/ios/chrome/browser/ios_chrome_main_parts.mm b/ios/chrome/browser/ios_chrome_main_parts.mm
index 72116c201ae362d3f1cd3cbc2fdd7765d0c8a51b..1363f9f566eb66449274570a5b890df084c74fa1 100644
--- a/ios/chrome/browser/ios_chrome_main_parts.mm
+++ b/ios/chrome/browser/ios_chrome_main_parts.mm
@@ -28,8 +28,10 @@
#include "components/rappor/rappor_service.h"
#include "components/task_scheduler_util/initialization_util.h"
#include "components/translate/core/browser/translate_download_manager.h"
+#include "components/variations/field_trial_config/field_trial_util.h"
#include "components/variations/service/variations_service.h"
#include "components/variations/variations_http_header_provider.h"
+#include "components/variations/variations_switches.h"
#include "ios/chrome/browser/about_flags.h"
#include "ios/chrome/browser/application_context_impl.h"
#include "ios/chrome/browser/browser_state/chrome_browser_state.h"
@@ -302,6 +304,15 @@ void IOSChromeMainParts::SetupFieldTrials() {
command_line->GetSwitchValueASCII(switches::kEnableIOSFeatures),
command_line->GetSwitchValueASCII(switches::kDisableIOSFeatures));
+#if defined(FIELDTRIAL_TESTING_ENABLED)
+ if (!command_line->HasSwitch(
+ variations::switches::kDisableFieldTrialTestingConfig) &&
+ !command_line->HasSwitch(switches::kForceFieldTrials) &&
+ !command_line->HasSwitch(variations::switches::kVariationsServerURL)) {
+ variations::AssociateDefaultFieldTrialConfig(feature_list.get());
+ }
+#endif // defined(FIELDTRIAL_TESTING_ENABLED)
+
variations::VariationsService* variations_service =
application_context_->GetVariationsService();
if (variations_service)
« no previous file with comments | « ios/chrome/browser/BUILD.gn ('k') | ios/chrome/browser/net/crl_set_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698