Prepare to abstract PersistedData by making it part of the configurator.

components/update_client/update_client_unittest.cc

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 051c4f9131c49cc34ac1f577007a60289535295e..c56a70e5cb2fe7da892978082bbdf0afff35d436 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -230,8 +230,7 @@ TEST_F(UpdateClientTest, OneCrxNoUpdate) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -345,8 +344,7 @@ TEST_F(UpdateClientTest, TwoCrxUpdateNoUpdate) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -559,8 +557,7 @@ TEST_F(UpdateClientTest, TwoCrxUpdate) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -831,8 +828,7 @@ TEST_F(UpdateClientTest, TwoCrxUpdateDownloadTimeout) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -1104,8 +1100,7 @@ TEST_F(UpdateClientTest, OneCrxDiffUpdate) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -1417,8 +1412,7 @@ TEST_F(UpdateClientTest, OneCrxInstallError) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -1607,8 +1601,7 @@ TEST_F(UpdateClientTest, OneCrxDiffUpdateFailsFullUpdateSucceeds) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -1915,8 +1908,7 @@ TEST_F(UpdateClientTest, OneCrxNoUpdateQueuedCall) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -2030,8 +2022,7 @@ TEST_F(UpdateClientTest, OneCrxInstall) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -2225,8 +2216,7 @@ TEST_F(UpdateClientTest, ConcurrentInstallSameCRX) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -2333,8 +2323,7 @@ TEST_F(UpdateClientTest, EmptyIdList) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -2387,8 +2376,7 @@ TEST_F(UpdateClientTest, SendUninstallPing) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return nullptr;
     }
 
@@ -2490,8 +2478,7 @@ TEST_F(UpdateClientTest, RetryAfter) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -2666,8 +2653,7 @@ TEST_F(UpdateClientTest, TwoCrxUpdateOneUpdateDisabled) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }
 
@@ -2916,8 +2902,7 @@ TEST_F(UpdateClientTest, OneCrxUpdateCheckFails) {
   class FakeUpdateChecker : public UpdateChecker {
    public:
     static std::unique_ptr<UpdateChecker> Create(
-        const scoped_refptr<Configurator>& config,
-        PersistedData* metadata) {
+        const scoped_refptr<Configurator>& config) {
       return base::MakeUnique<FakeUpdateChecker>();
     }