Add disabled origin trial feature list

chrome/browser/component_updater/origin_trials_component_installer.cc

 // Copyright 2016 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/component_updater/origin_trials_component_installer.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/component_updater/component_updater_paths.h"
 #include "components/prefs/pref_service.h"
+#include "components/prefs/scoped_user_pref_update.h"
 
 // The client-side configuration for the origin trial framework can be
 // overridden by an installed component named 'OriginTrials' (extension id
 // kfoklmclfodeliojeaekpoflbkkhojea. This component currently consists of just a
 // manifest.json file, which can contain a custom key named 'origin-trials'. The
 // value of this key is a dictionary:
 //
 // {
 //   "public-key": "<base64-encoding of replacement public key>",
 //   "disabled-features": [<list of features to disable>],
 //   "revoked-tokens": "<base64-encoded data>"
 // }
 //
-// TODO(iclelland): Implement support for revoked tokens and disabled features.
+// TODO(iclelland): Implement support for revoked tokens.
 //
 // If the component is not present in the user data directory, the default
 // configuration will be used.
 
 namespace component_updater {
 
 namespace {
 
 // Extension id is kfoklmclfodeliojeaekpoflbkkhojea
 const uint8_t kSha256Hash[] = {0xa5, 0xea, 0xbc, 0x2b, 0x5e, 0x34, 0xb8, 0xe9,
@@ skipping 29 matching lines @@
     const base::FilePath& install_dir,
     std::unique_ptr<base::DictionaryValue> manifest) {
   // Read the public key from the manifest and set values in browser
   // local_state. These will be used on the next browser restart.
   PrefService* local_state = g_browser_process->local_state();
   std::string override_public_key;
   if (manifest->GetString("origin-trials.public-key", &override_public_key)) {
     local_state->Set("origin-trials.public-key",
                      base::StringValue(override_public_key));
   }
+  base::ListValue* override_disabled_feature_list;

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

please initialize.

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

Good catch, thanks. Done.

+  if (manifest->GetList("origin-trials.disabled-features",
+                        &override_disabled_feature_list)) {
+    ListPrefUpdate update(local_state, "origin-trials.disabled-features");

[chasej, 2016/06/07 15:51:31]

Use prefs::kOriginTrialDisabledFeatures constant?

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

Done.

+    update->Swap(override_disabled_feature_list);
+  }
 }
 
 base::FilePath OriginTrialsComponentInstallerTraits::GetRelativeInstallDir()
     const {
   return base::FilePath(FILE_PATH_LITERAL("OriginTrials"));
 }
 
 void OriginTrialsComponentInstallerTraits::GetHash(
     std::vector<uint8_t>* hash) const {
   if (!hash)
@@ skipping 13 matching lines @@
                                    const base::FilePath& user_data_dir) {
   std::unique_ptr<ComponentInstallerTraits> traits(
       new OriginTrialsComponentInstallerTraits());
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(std::move(traits));
   installer->Register(cus, base::Closure());
 }
 
 }  // namespace component_updater