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

components/update_client/update_client_unittest.cc

 // Copyright 2015 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.
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/files/file_path.h"
@@ skipping 212 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       EXPECT_TRUE(enabled_component_updates);
@@ skipping 93 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       /*
@@ skipping 192 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       /*
@@ skipping 250 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       /*
@@ skipping 251 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       static int num_call = 0;
@@ skipping 291 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       /*
@@ skipping 168 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       static int num_call = 0;
@@ skipping 286 matching lines @@
       EXPECT_EQ(Error::NONE, error);
 
       if (num_call == 2)
         quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       EXPECT_TRUE(enabled_component_updates);
@@ skipping 93 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       /*
@@ skipping 173 matching lines @@
       if (num_call == 2) {
         EXPECT_EQ(Error::NONE, error);
         quit_closure.Run();
       }
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       EXPECT_TRUE(enabled_component_updates);
@@ skipping 86 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       DCHECK_EQ(Error::INVALID_ARGUMENT, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       return false;
@@ skipping 32 matching lines @@
   class CompletionCallbackFake {
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       quit_closure.Run();
     }
   };
 
   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;
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       return false;
@@ skipping 81 matching lines @@
         EXPECT_EQ(Error::NONE, error);
       }
 
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       static int num_call = 0;
@@ skipping 154 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::NONE, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       /*
@@ skipping 228 matching lines @@
    public:
     static void Callback(const base::Closure& quit_closure, Error error) {
       EXPECT_EQ(Error::UPDATE_CHECK_ERROR, error);
       quit_closure.Run();
     }
   };
 
   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>();
     }
 
     bool CheckForUpdates(
         const std::vector<std::string>& ids_to_check,
         const IdToComponentPtrMap& components,
         const std::string& additional_attributes,
         bool enabled_component_updates,
         const UpdateCheckCallback& update_check_callback) override {
       EXPECT_TRUE(enabled_component_updates);
@@ skipping 57 matching lines @@
   update_client->Update(
       ids, base::Bind(&DataCallbackFake::Callback),
       base::Bind(&CompletionCallbackFake::Callback, quit_closure()));
 
   RunThreads();
 
   update_client->RemoveObserver(&observer);
 }
 
 }  // namespace update_client