Add disabled origin trial feature list

chrome/browser/chrome_browser_main.cc

Index: chrome/browser/chrome_browser_main.cc
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 68c6df03d3a20620a9704419c356d73e7c20cfaf..42139866896ac34f82c9bc06d0c7b924d8addd20 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -818,6 +818,27 @@ void ChromeBrowserMainParts::SetupOriginTrials() {
         switches::kOriginTrialPublicKey,
         local_state_->GetString(prefs::kOriginTrialPublicKey));
   }
+  if (!command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
+    const base::ListValue* override_disabled_feature_list =
+        local_state_->GetList(prefs::kOriginTrialDisabledFeatures);
+    std::string disabled_feature;
+    std::vector<std::string> disabled_features;
+    if (override_disabled_feature_list) {
+      for (const auto& item : *override_disabled_feature_list) {
+        if (item->GetAsString(&disabled_feature)) {
+          disabled_features.push_back(disabled_feature);
+        }
+      }
+      if (!disabled_features.empty()) {
+        std::string override_disabled_features =

[Sorin Jianu, 2016/06/07 17:20:24]

can be const.

[iclelland, 2016/06/08 13:37:55]

Done.

+            base::JoinString(disabled_features, "|");
+        base::CommandLine* command_line =
+            base::CommandLine::ForCurrentProcess();
+        command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures,
+                                        override_disabled_features);
+      }
+    }
+  }
 }
 
 // -----------------------------------------------------------------------------