| Index: chrome/browser/component_updater/origin_trials_component_installer.h
|
| diff --git a/chrome/browser/component_updater/ev_whitelist_component_installer.h b/chrome/browser/component_updater/origin_trials_component_installer.h
|
| similarity index 58%
|
| copy from chrome/browser/component_updater/ev_whitelist_component_installer.h
|
| copy to chrome/browser/component_updater/origin_trials_component_installer.h
|
| index 72a1382b5d0d3fa38547ef24eedded382c44a0bb..c097b212a50f4ddf18eb82f47d3727605a4f7f90 100644
|
| --- a/chrome/browser/component_updater/ev_whitelist_component_installer.h
|
| +++ b/chrome/browser/component_updater/origin_trials_component_installer.h
|
| @@ -1,40 +1,38 @@
|
| -// Copyright 2014 The Chromium Authors. All rights reserved.
|
| +// 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.
|
|
|
| -#ifndef CHROME_BROWSER_COMPONENT_UPDATER_EV_WHITELIST_COMPONENT_INSTALLER_H_
|
| -#define CHROME_BROWSER_COMPONENT_UPDATER_EV_WHITELIST_COMPONENT_INSTALLER_H_
|
| +#ifndef CHROME_BROWSER_COMPONENT_UPDATER_ORIGIN_TRIALS_COMPONENT_INSTALLER_H_
|
| +#define CHROME_BROWSER_COMPONENT_UPDATER_ORIGIN_TRIALS_COMPONENT_INSTALLER_H_
|
|
|
| #include <stdint.h>
|
| +
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| #include "base/values.h"
|
| +#include "base/version.h"
|
| #include "components/component_updater/default_component_installer.h"
|
|
|
| -namespace base {
|
| -class FilePath;
|
| -} // namespace base
|
| -
|
| namespace component_updater {
|
|
|
| class ComponentUpdateService;
|
|
|
| -class EVWhitelistComponentInstallerTraits : public ComponentInstallerTraits {
|
| +class OriginTrialsComponentInstallerTraits : public ComponentInstallerTraits {
|
| public:
|
| - EVWhitelistComponentInstallerTraits() {}
|
| - ~EVWhitelistComponentInstallerTraits() override {}
|
| + OriginTrialsComponentInstallerTraits() = default;
|
| + ~OriginTrialsComponentInstallerTraits() override = default;
|
|
|
| private:
|
| - // The following methods override ComponentInstallerTraits.
|
| + bool VerifyInstallation(const base::DictionaryValue& manifest,
|
| + const base::FilePath& install_dir) const override;
|
| bool CanAutoUpdate() const override;
|
| bool RequiresNetworkEncryption() const override;
|
| bool OnCustomInstall(const base::DictionaryValue& manifest,
|
| const base::FilePath& install_dir) override;
|
| - bool VerifyInstallation(const base::DictionaryValue& manifest,
|
| - const base::FilePath& install_dir) const override;
|
| void ComponentReady(const base::Version& version,
|
| const base::FilePath& install_dir,
|
| std::unique_ptr<base::DictionaryValue> manifest) override;
|
| @@ -43,16 +41,14 @@ class EVWhitelistComponentInstallerTraits : public ComponentInstallerTraits {
|
| std::string GetName() const override;
|
| std::string GetAp() const override;
|
|
|
| - static base::FilePath GetInstalledPath(const base::FilePath& base);
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(EVWhitelistComponentInstallerTraits);
|
| + DISALLOW_COPY_AND_ASSIGN(OriginTrialsComponentInstallerTraits);
|
| };
|
|
|
| // Call once during startup to make the component update service aware of
|
| -// the EV whitelist.
|
| -void RegisterEVWhitelistComponent(ComponentUpdateService* cus,
|
| - const base::FilePath& user_data_dir);
|
| +// the origin trials update component.
|
| +void RegisterOriginTrialsComponent(ComponentUpdateService* cus,
|
| + const base::FilePath& user_data_dir);
|
|
|
| } // namespace component_updater
|
|
|
| -#endif // CHROME_BROWSER_COMPONENT_UPDATER_EV_WHITELIST_COMPONENT_INSTALLER_H_
|
| +#endif // CHROME_BROWSER_COMPONENT_UPDATER_ORIGIN_TRIALS_COMPONENT_INSTALLER_H_
|
|
|