Implement support in DefaultComponentInstaller for picking up bundled

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"
@@ skipping 56 matching lines @@
     std::unique_ptr<base::DictionaryValue> manifest) {
   // Read the public key from the manifest and set the command line.
   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);
   }
 }
 
-base::FilePath OriginTrialsComponentInstallerTraits::GetBaseDirectory() const {
-  base::FilePath result;
-  PathService::Get(DIR_ORIGIN_TRIAL_KEYS, &result);
-  return result;
+base::FilePath OriginTrialsComponentInstallerTraits::GetRelativeInstallDir()
+    const {
+  return base::FilePath(FILE_PATH_LITERAL("OriginTrials"));
 }
 
 void OriginTrialsComponentInstallerTraits::GetHash(
     std::vector<uint8_t>* hash) const {
   if (!hash)
     return;
   hash->assign(kSha256Hash, kSha256Hash + arraysize(kSha256Hash));
 }
 
 std::string OriginTrialsComponentInstallerTraits::GetName() const {
   return "Origin Trials";
 }
 
 std::string OriginTrialsComponentInstallerTraits::GetAp() const {
   return std::string();
 }
 
 void RegisterOriginTrialsComponent(ComponentUpdateService* cus,
                                    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