| Index: chrome/browser/component_updater/cld_component_installer.cc
|
| diff --git a/chrome/browser/component_updater/cld_component_installer.cc b/chrome/browser/component_updater/cld_component_installer.cc
|
| index 190925a8b2a9123a1494e773b59bd872e0780a5a..5f8bb9bbd6569cb6a709782ccb88bdd485ca39c0 100644
|
| --- a/chrome/browser/component_updater/cld_component_installer.cc
|
| +++ b/chrome/browser/component_updater/cld_component_installer.cc
|
| @@ -14,7 +14,6 @@
|
| #include "base/logging.h"
|
| #include "base/path_service.h"
|
| #include "base/platform_file.h"
|
| -#include "chrome/browser/component_updater/default_component_installer.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| @@ -48,31 +47,6 @@ const uint8 kPublicKeySHA256[32] = {
|
|
|
| const char kCldManifestName[] = "CLD2 Data";
|
|
|
| -class CldComponentInstallerTraits : public ComponentInstallerTraits {
|
| - public:
|
| - CldComponentInstallerTraits();
|
| - virtual ~CldComponentInstallerTraits() {}
|
| -
|
| - private:
|
| - // The following methods override ComponentInstallerTraits.
|
| - virtual bool CanAutoUpdate() const OVERRIDE;
|
| - virtual bool OnCustomInstall(const base::DictionaryValue& manifest,
|
| - const base::FilePath& install_dir) OVERRIDE;
|
| - virtual bool VerifyInstallation(
|
| - const base::FilePath& install_dir) const OVERRIDE;
|
| - virtual void ComponentReady(
|
| - const base::Version& version,
|
| - const base::FilePath& path,
|
| - scoped_ptr<base::DictionaryValue> manifest) OVERRIDE;
|
| - virtual base::FilePath GetBaseDirectory() const OVERRIDE;
|
| - virtual void GetHash(std::vector<uint8>* hash) const OVERRIDE;
|
| - virtual std::string GetName() const OVERRIDE;
|
| -
|
| - base::FilePath GetInstalledPath(const base::FilePath& base) const;
|
| - void SetLatestCldDataFile(const base::FilePath& path);
|
| - DISALLOW_COPY_AND_ASSIGN(CldComponentInstallerTraits);
|
| -};
|
| -
|
| CldComponentInstallerTraits::CldComponentInstallerTraits() {
|
| }
|
|
|
| @@ -141,7 +115,6 @@ void RegisterCldComponent(ComponentUpdateService* cus) {
|
| installer->Register(cus);
|
| }
|
|
|
| -// This method is completely threadsafe.
|
| void CldComponentInstallerTraits::SetLatestCldDataFile(
|
| const base::FilePath& path) {
|
| VLOG(1) << "Setting CLD data file location: " << path.value();
|
|
|