| Index: components/update_client/update_client_unittest.cc
|
| diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
|
| index 957f697323d9ecefc276a344f40a865eedf807a6..76ba9ba60ca0a432f3eee1ab5106be7d31e738db 100644
|
| --- a/components/update_client/update_client_unittest.cc
|
| +++ b/components/update_client/update_client_unittest.cc
|
| @@ -19,6 +19,7 @@
|
| #include "base/thread_task_runner_handle.h"
|
| #include "base/values.h"
|
| #include "base/version.h"
|
| +#include "components/update_client/component_metadata.h"
|
| #include "components/update_client/crx_update_item.h"
|
| #include "components/update_client/ping_manager.h"
|
| #include "components/update_client/test_configurator.h"
|
| @@ -146,6 +147,9 @@ class UpdateClientTest : public testing::Test {
|
| static base::FilePath TestFilePath(const char* file);
|
|
|
| scoped_refptr<update_client::Configurator> config() { return config_; }
|
| + scoped_refptr<update_client::ComponentMetadata> metadata() {
|
| + return metadata_;
|
| + }
|
|
|
| base::Closure quit_closure() { return quit_closure_; }
|
|
|
| @@ -159,6 +163,7 @@ class UpdateClientTest : public testing::Test {
|
| scoped_ptr<base::SequencedWorkerPoolOwner> worker_pool_;
|
|
|
| scoped_refptr<update_client::Configurator> config_;
|
| + scoped_refptr<update_client::ComponentMetadata> metadata_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(UpdateClientTest);
|
| };
|
| @@ -172,6 +177,8 @@ UpdateClientTest::UpdateClientTest()
|
| config_ = new TestConfigurator(
|
| pool->GetSequencedTaskRunner(pool->GetSequenceToken()),
|
| message_loop_.task_runner());
|
| + metadata_ = new ComponentMetadata(
|
| + base::FilePath(), message_loop_.task_runner());
|
| }
|
|
|
| UpdateClientTest::~UpdateClientTest() {
|
| @@ -218,7 +225,8 @@ TEST_F(UpdateClientTest, OneCrxNoUpdate) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -324,7 +332,8 @@ TEST_F(UpdateClientTest, TwoCrxUpdateNoUpdate) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -509,7 +518,8 @@ TEST_F(UpdateClientTest, TwoCrxUpdate) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -756,7 +766,8 @@ TEST_F(UpdateClientTest, TwoCrxUpdateDownloadTimeout) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -1006,7 +1017,8 @@ TEST_F(UpdateClientTest, OneCrxDiffUpdate) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -1297,7 +1309,8 @@ TEST_F(UpdateClientTest, OneCrxInstallError) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -1480,7 +1493,8 @@ TEST_F(UpdateClientTest, OneCrxDiffUpdateFailsFullUpdateSucceeds) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -1769,7 +1783,8 @@ TEST_F(UpdateClientTest, OneCrxNoUpdateQueuedCall) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -1868,7 +1883,8 @@ TEST_F(UpdateClientTest, OneCrxInstall) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -2054,7 +2070,8 @@ TEST_F(UpdateClientTest, ConcurrentInstallSameCRX) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -2147,7 +2164,8 @@ TEST_F(UpdateClientTest, EmptyIdList) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
| @@ -2192,7 +2210,8 @@ TEST_F(UpdateClientTest, SendUninstallPing) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return nullptr;
|
| }
|
|
|
| @@ -2289,7 +2308,8 @@ TEST_F(UpdateClientTest, RetryAfter) {
|
| class FakeUpdateChecker : public UpdateChecker {
|
| public:
|
| static scoped_ptr<UpdateChecker> Create(
|
| - const scoped_refptr<Configurator>& config) {
|
| + const scoped_refptr<Configurator>& config,
|
| + const scoped_refptr<ComponentMetadata>& metadata) {
|
| return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
|
| }
|
|
|
|
|