Add disabled origin trial feature list

chrome/browser/chrome_browser_main.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
@@ skipping 800 matching lines @@
       base::TimeTicks::Now(), is_first_run, g_browser_process->local_state());
 }
 
 void ChromeBrowserMainParts::SetupOriginTrials() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch(switches::kOriginTrialPublicKey)) {
     command_line->AppendSwitchASCII(
         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);
+      }
+    }
+  }
 }
 
 // -----------------------------------------------------------------------------
 // TODO(viettrungluu): move more/rest of BrowserMain() into BrowserMainParts.
 
 #if defined(OS_WIN)
 #define DLLEXPORT __declspec(dllexport)
 
 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
 extern "C" {
@@ skipping 1173 matching lines @@
   chromeos::CrosSettings::Shutdown();
 #endif  // defined(OS_CHROMEOS)
 #endif  // defined(OS_ANDROID)
 }
 
 // Public members:
 
 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
   chrome_extra_parts_.push_back(parts);
 }