diff options
author | sorin <sorin@chromium.org> | 2015-01-23 17:15:00 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-24 01:16:25 +0000 |
commit | 52ac088530b109fa506c4491aea8cf12bcadc63d (patch) | |
tree | 64a47ef9e8d4e4662e7366aaea856b9da32ff168 /components/component_updater/default_component_installer.cc | |
parent | 9d3bb0c75ddbeafd53f5ad32813b0fe70b7e0779 (diff) | |
download | chromium_src-52ac088530b109fa506c4491aea8cf12bcadc63d.zip chromium_src-52ac088530b109fa506c4491aea8cf12bcadc63d.tar.gz chromium_src-52ac088530b109fa506c4491aea8cf12bcadc63d.tar.bz2 |
This is a mechanical change. It is large but straightforward in its intention.
jam: please review the changes under //src/chrome/browser
blundell: please review the changes under //src/components
waffles: please review the component updater and the update client changes.
The intention here is to move most of the component updater dependencies to update_client, with the goal of creating an update_client Chrome component that encapsulates the details of talking with the update servers, downloading, and invoking installers of CRXs for both extensions and components.
The dependencies should be: component_updater->update_client.
This change just lays down some of the code that will be further used by update_client. No functionality is provided in this change. Also consider the overall goal as WIP; therefore, some of the naming and dependencies are not final. We want to have most of the code in place for future work, but want to minimize the changes to the existing production code and keep the refactoring mechanical for this change.
BUG=450337
Review URL: https://codereview.chromium.org/808773005
Cr-Commit-Position: refs/heads/master@{#312986}
Diffstat (limited to 'components/component_updater/default_component_installer.cc')
-rw-r--r-- | components/component_updater/default_component_installer.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/components/component_updater/default_component_installer.cc b/components/component_updater/default_component_installer.cc index 526b864..6588973 100644 --- a/components/component_updater/default_component_installer.cc +++ b/components/component_updater/default_component_installer.cc @@ -14,9 +14,12 @@ #include "base/values.h" #include "base/version.h" // TODO(ddorwin): Find a better place for ReadManifest. -#include "components/component_updater/component_unpacker.h" -#include "components/component_updater/component_updater_configurator.h" +#include "components/component_updater/component_updater_service.h" #include "components/component_updater/default_component_installer.h" +#include "components/update_client/component_unpacker.h" +#include "components/update_client/update_client.h" + +using update_client::CrxComponent; namespace component_updater { @@ -155,7 +158,8 @@ void DefaultComponentInstaller::StartRegistration(ComponentUpdateService* cus) { continue; } - scoped_ptr<base::DictionaryValue> manifest = ReadManifest(path); + scoped_ptr<base::DictionaryValue> manifest = + update_client::ReadManifest(path); if (!manifest || !installer_traits_->VerifyInstallation(*manifest, path)) { DLOG(ERROR) << "Failed to read manifest or verify installation for " << installer_traits_->GetName() << " (" |