Change const Configurator& with scoped_refptr<Configurator>.
This is a mechanical refactoring to replace C++ references to Configurator
with refcounted pointers. This change preceeds exposing a public interface
to send an uninstall ping through update_client.
Configurator is a refcounted type to begin with but some old code is still
using it as a C++ reference.
BUG=501641
Review URL: https://codereview.chromium.org/1571983002
Cr-Commit-Position: refs/heads/master@{#368506}
diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index 06171d68..6420439 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -94,7 +94,7 @@
class FakePingManagerImpl : public PingManager {
public:
- explicit FakePingManagerImpl(const Configurator& config);
+ explicit FakePingManagerImpl(const scoped_refptr<Configurator>& config);
~FakePingManagerImpl() override;
void OnUpdateComplete(const CrxUpdateItem* item) override;
@@ -106,9 +106,9 @@
DISALLOW_COPY_AND_ASSIGN(FakePingManagerImpl);
};
-FakePingManagerImpl::FakePingManagerImpl(const Configurator& config)
- : PingManager(config) {
-}
+FakePingManagerImpl::FakePingManagerImpl(
+ const scoped_refptr<Configurator>& config)
+ : PingManager(config) {}
FakePingManagerImpl::~FakePingManagerImpl() {
}
@@ -216,7 +216,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -250,12 +251,12 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override { EXPECT_TRUE(items().empty()); }
};
- scoped_ptr<PingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<PingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -321,7 +322,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -413,7 +415,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -426,7 +428,7 @@
}
};
- scoped_ptr<PingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<PingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -501,7 +503,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -636,7 +639,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -654,7 +657,7 @@
}
};
- scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<FakePingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -739,7 +742,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -874,7 +878,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -892,7 +896,7 @@
}
};
- scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<FakePingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -980,7 +984,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -1132,7 +1137,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -1150,7 +1155,7 @@
}
};
- scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<FakePingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -1257,7 +1262,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -1349,7 +1355,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -1362,7 +1368,7 @@
}
};
- scoped_ptr<PingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<PingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -1436,7 +1442,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -1603,7 +1610,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -1622,7 +1629,7 @@
}
};
- scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<FakePingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -1711,7 +1718,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -1745,12 +1753,12 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override { EXPECT_TRUE(items().empty()); }
};
- scoped_ptr<PingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<PingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -1809,7 +1817,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -1905,7 +1914,7 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override {
const auto& ping_items = items();
@@ -1918,7 +1927,7 @@
}
};
- scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<FakePingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -1991,7 +2000,8 @@
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -2025,12 +2035,12 @@
class FakePingManager : public FakePingManagerImpl {
public:
- explicit FakePingManager(const Configurator& config)
+ explicit FakePingManager(const scoped_refptr<Configurator>& config)
: FakePingManagerImpl(config) {}
~FakePingManager() override { EXPECT_TRUE(items().empty()); }
};
- scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config()));
+ scoped_ptr<FakePingManager> ping_manager(new FakePingManager(config()));
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
config(), std::move(ping_manager), &FakeUpdateChecker::Create,
&FakeCrxDownloader::Create));
@@ -2083,7 +2093,8 @@
};
class FakeUpdateChecker : public UpdateChecker {
public:
- static scoped_ptr<UpdateChecker> Create(const Configurator& config) {
+ static scoped_ptr<UpdateChecker> Create(
+ const scoped_refptr<Configurator>& config) {
return scoped_ptr<UpdateChecker>(new FakeUpdateChecker());
}
@@ -2113,7 +2124,7 @@
};
scoped_refptr<UpdateClient> update_client(new UpdateClientImpl(
- config(), make_scoped_ptr(new FakePingManagerImpl(*config())),
+ config(), make_scoped_ptr(new FakePingManagerImpl(config())),
&FakeUpdateChecker::Create, &FakeCrxDownloader::Create));
std::vector<std::string> empty_id_list;
