Store Origin Trials public key in browser prefs

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"
 
 // 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>],
@@ skipping 35 matching lines @@
 bool OriginTrialsComponentInstallerTraits::OnCustomInstall(
     const base::DictionaryValue& manifest,
     const base::FilePath& install_dir) {
   return true;
 }
 
 void OriginTrialsComponentInstallerTraits::ComponentReady(
     const base::Version& version,
     const base::FilePath& install_dir,
     std::unique_ptr<base::DictionaryValue> manifest) {
-  // Read the public key from the manifest and set the command line.
+  // 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)) {
-    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    command_line->AppendSwitchASCII(switches::kOriginTrialPublicKey,
-                                    override_public_key);
+    local_state->Set("origin-trials.public-key",

[chasej, 2016/06/07 15:09:40]

Can this use the prefs::kOriginTrialPublicKey constant defined in
"chrome/common/pref_names.h"?

[iclelland, 2016/06/08 02:48:22]

It absolutely can, and should. Thanks. Done.

+                     base::StringValue(override_public_key));
   }
 }
 
 base::FilePath OriginTrialsComponentInstallerTraits::GetRelativeInstallDir()
     const {
   return base::FilePath(FILE_PATH_LITERAL("OriginTrials"));
 }
 
 void OriginTrialsComponentInstallerTraits::GetHash(
     std::vector<uint8_t>* hash) const {
@@ skipping 14 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