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..dbaa0a2a32aa11b304fcda2b3d57d342664b6250 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;

[chasej, 2016/06/08 16:14:24]

Nit: Should these be moved inside the if (override_disabled_feature_list)?
Because they are outside the if statement, I was looking to see them used
further down.

[iclelland, 2016/06/08 17:43:44]

Done.

+    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()) {
+        const std::string override_disabled_features =
+            base::JoinString(disabled_features, "|");
+        base::CommandLine* command_line =
+            base::CommandLine::ForCurrentProcess();

[chasej, 2016/06/08 16:14:24]

This should use the command_line variable from the top of the method? Any reason
to redefine the variable here?

[iclelland, 2016/06/08 17:43:44]

Done.

+        command_line->AppendSwitchASCII(switches::kOriginTrialDisabledFeatures,
+                                        override_disabled_features);
+      }
+    }
+  }
 }
 
 // -----------------------------------------------------------------------------