Implement support in DefaultComponentInstaller for picking up bundled

chrome/browser/component_updater/cld_component_installer.cc

 // Copyright 2014 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/cld_component_installer.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 80 matching lines @@
   // We can't really do much to verify the CLD2 data file. In theory we could
   // read the headers, but that won't do much other than tell us whether or
   // not the headers are valid. So just check if the file exists.
   const base::FilePath expected_file = GetInstalledPath(install_dir);
   VLOG(1) << "Verifying install: " << expected_file.value();
   const bool result = base::PathExists(expected_file);
   VLOG(1) << "Verification result: " << (result ? "valid" : "invalid");
   return result;
 }
 
-base::FilePath CldComponentInstallerTraits::GetBaseDirectory() const {
-  base::FilePath result;
-  PathService::Get(DIR_COMPONENT_CLD2, &result);
-  return result;
+base::FilePath CldComponentInstallerTraits::GetRelativeInstallDir() const {
+  return base::FilePath(FILE_PATH_LITERAL("CLD"));
 }
 
 void CldComponentInstallerTraits::GetHash(std::vector<uint8_t>* hash) const {
   hash->assign(kPublicKeySHA256,
                kPublicKeySHA256 + arraysize(kPublicKeySHA256));
 }
 
 std::string CldComponentInstallerTraits::GetName() const {
   return kCldManifestName;
 }
@@ skipping 27 matching lines @@
   VLOG(1) << "Setting CLD data file location: " << path.value();
   g_latest_cld_data_file.Get() = path;
   translate::CldDataSource::Get()->SetCldDataFilePath(path);
 }
 
 base::FilePath CldComponentInstallerTraits::GetLatestCldDataFile() {
   return g_latest_cld_data_file.Get();
 }
 
 }  // namespace component_updater