[Origin Trials] Support updates of disabled token 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 <utility>
 
 #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 "chrome/common/pref_names.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
+// llkgjffcdpffmhiakmfcdcblohccpfmo. 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>"
+//   "disabled-tokens":
+//   {
+//     "signatures": [<list of token signatures to disable, base64-encoded>]
+//   }
 // }
 //
-// 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 {
 
 static const char kManifestOriginTrialsKey[] = "origin-trials";
 static const char kManifestPublicKeyPath[] = "origin-trials.public-key";
 static const char kManifestDisabledFeaturesPath[] =
     "origin-trials.disabled-features";
+static const char kManifestDisabledTokenSignaturesPath[] =
+    "origin-trials.disabled-tokens.signatures";
 
 // Extension id is llkgjffcdpffmhiakmfcdcblohccpfmo
 const uint8_t kSha256Hash[] = {0xbb, 0xa6, 0x95, 0x52, 0x3f, 0x55, 0xc7, 0x80,
                                0xac, 0x52, 0x32, 0x1b, 0xe7, 0x22, 0xf5, 0xce,
                                0x6a, 0xfd, 0x9c, 0x9e, 0xa9, 0x2a, 0x0b, 0x50,
                                0x60, 0x2b, 0x7f, 0x6c, 0x64, 0x80, 0x09, 0x04};
 
 }  // namespace
 
 bool OriginTrialsComponentInstallerTraits::VerifyInstallation(
@@ skipping 38 matching lines @@
   base::ListValue* override_disabled_feature_list = nullptr;
   const bool manifest_has_disabled_features = manifest->GetList(
       kManifestDisabledFeaturesPath, &override_disabled_feature_list);
   if (manifest_has_disabled_features &&
       !override_disabled_feature_list->empty()) {
     ListPrefUpdate update(local_state, prefs::kOriginTrialDisabledFeatures);
     update->Swap(override_disabled_feature_list);
   } else {
     local_state->ClearPref(prefs::kOriginTrialDisabledFeatures);
   }
+  base::ListValue* disabled_tokens_list = nullptr;
+  const bool manifest_has_disabled_tokens = manifest->GetList(
+      kManifestDisabledTokenSignaturesPath, &disabled_tokens_list);
+  if (manifest_has_disabled_tokens && !disabled_tokens_list->empty()) {
+    ListPrefUpdate update(local_state, prefs::kOriginTrialDisabledTokens);
+    update->Swap(disabled_tokens_list);
+  } else {
+    local_state->ClearPref(prefs::kOriginTrialDisabledTokens);
+  }
 }
 
 base::FilePath OriginTrialsComponentInstallerTraits::GetRelativeInstallDir()
     const {
   return base::FilePath(FILE_PATH_LITERAL("OriginTrials"));
 }
 
 void OriginTrialsComponentInstallerTraits::GetHash(
     std::vector<uint8_t>* hash) const {
   if (!hash)
@@ skipping 19 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