Index: chrome/browser/chrome_content_browser_client.cc |
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc |
index b85bffd4f607d443c7ec415e9501b7435d365165..2899b776da60e0327171607ade07397ceb5f1519 100644 |
--- a/chrome/browser/chrome_content_browser_client.cc |
+++ b/chrome/browser/chrome_content_browser_client.cc |
@@ -51,6 +51,7 @@ |
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings.h" |
#include "chrome/browser/net/spdyproxy/data_reduction_proxy_chrome_settings_factory.h" |
#include "chrome/browser/notifications/platform_notification_service_impl.h" |
+#include "chrome/browser/origin_trials/origin_trial_controller.h" |
#include "chrome/browser/platform_util.h" |
#include "chrome/browser/prerender/prerender_final_status.h" |
#include "chrome/browser/prerender/prerender_manager.h" |
@@ -1587,6 +1588,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
MaybeAppendBlinkSettingsSwitchForFieldTrial( |
browser_command_line, command_line); |
+ OriginTrialController::UpdateCommandLineFromFieldTrials(command_line); |
+ |
// Please keep this in alphabetical order. |
static const char* const kSwitchNames[] = { |
#if defined(OS_ANDROID) |
@@ -1639,6 +1642,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches( |
#endif |
switches::kJavaScriptHarmony, |
switches::kMessageLoopHistogrammer, |
+ switches::kOriginTrialPublicKey, |
switches::kPpapiFlashArgs, |
switches::kPpapiFlashPath, |
switches::kPpapiFlashVersion, |