Add disabled origin trial feature list

chrome/common/chrome_content_client.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/common/chrome_content_client.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <tuple>
@@ skipping 680 matching lines @@
 }
 
 bool ChromeContentClient::IsSupplementarySiteIsolationModeEnabled() {
 #if defined(ENABLE_EXTENSIONS)
   return extensions::IsIsolateExtensionsEnabled();
 #else
   return false;
 #endif
 }
 
-base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() {
+base::StringPiece ChromeContentClient::GetOriginTrialPublicKey() const {
   return origin_trial_key_manager_.GetPublicKey();
 }
 
+bool ChromeContentClient::IsOriginTrialFeatureDisabled(
+    base::StringPiece feature) const {
+  return origin_trial_key_manager_.IsFeatureDisabled(feature);
+}
+
 void ChromeContentClient::InitializeOriginTrialPolicy() {
-  // Set the public key for the origin trial key manager, based on the command
-  // line flags which were passed to this process.
+  // Set the public key and disabled feature list for the origin trial key
+  // manager, based on the command line flags which were passed to this process.
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kOriginTrialPublicKey)) {
     origin_trial_key_manager()->SetPublicKeyFromASCIIString(
         command_line->GetSwitchValueASCII(switches::kOriginTrialPublicKey));
   }
+  if (command_line->HasSwitch(switches::kOriginTrialDisabledFeatures)) {
+    origin_trial_key_manager()->SetDisabledFeatures(
+        command_line->GetSwitchValueASCII(
+            switches::kOriginTrialDisabledFeatures));
+  }
 }
 
 #if defined(OS_ANDROID)
 media::MediaClientAndroid* ChromeContentClient::GetMediaClientAndroid() {
   return new ChromeMediaClientAndroid();
 }
 #endif  // OS_ANDROID