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

chrome/browser/component_updater/chrome_component_updater_configurator.cc

 // Copyright 2014 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 "chrome/browser/component_updater/chrome_component_updater_configurator.h"
 
 #include <string>
 #include <vector>
 
 #include "base/sequenced_task_runner.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
 #include "base/version.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/component_updater/component_patcher_operation_out_of_process.h"
 #include "chrome/browser/component_updater/component_updater_utils.h"
 #include "chrome/browser/google/google_brand.h"
 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
 #include "chrome/common/channel_info.h"
 #include "chrome/common/pref_names.h"
 #include "components/component_updater/configurator_impl.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
+#include "components/update_client/persisted_data.h"
 #include "components/update_client/update_query_params.h"
 
 #if defined(OS_WIN)
 #include "base/win/win_util.h"
 #include "chrome/installer/util/google_update_settings.h"
 #endif
 
 namespace component_updater {
 
 namespace {
@@ skipping 21 matching lines @@
   std::string GetDownloadPreference() const override;
   net::URLRequestContextGetter* RequestContext() const override;
   scoped_refptr<update_client::OutOfProcessPatcher> CreateOutOfProcessPatcher()
       const override;
   bool EnabledDeltas() const override;
   bool EnabledComponentUpdates() const override;
   bool EnabledBackgroundDownloader() const override;
   bool EnabledCupSigning() const override;
   scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
       const override;
-  PrefService* GetPrefService() const override;
   bool IsPerUserInstall() const override;
+  std::unique_ptr<update_client::PersistedData> CreateMetadata() const override;
 
  private:
   friend class base::RefCountedThreadSafe<ChromeConfigurator>;
 
   ConfiguratorImpl configurator_impl_;
   PrefService* pref_service_;  // This member is not owned by this class.
 
   ~ChromeConfigurator() override {}
 };
 
@@ skipping 105 matching lines @@
 // after the browser shuts down, until the OS terminates the process. This
 // imposes certain requirements for the code using the task runner, such as
 // not accessing any global browser state while the code is running.
 scoped_refptr<base::SequencedTaskRunner>
 ChromeConfigurator::GetSequencedTaskRunner() const {
   return base::CreateSequencedTaskRunnerWithTraits(
       {base::MayBlock(), base::TaskPriority::BACKGROUND,
        base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN});
 }
 
-PrefService* ChromeConfigurator::GetPrefService() const {
-  DCHECK(pref_service_);
-  return pref_service_;
-}
-
 bool ChromeConfigurator::IsPerUserInstall() const {
   return component_updater::IsPerUserInstall();
 }
 
+std::unique_ptr<update_client::PersistedData>
+ChromeConfigurator::CreateMetadata() const {
+  DCHECK(pref_service_);
+  return base::MakeUnique<update_client::PersistedData>(pref_service_);
+}
+
 }  // namespace
 
 void RegisterPrefsForChromeComponentUpdaterConfigurator(
     PrefRegistrySimple* registry) {
   // The component updates are enabled by default, if the preference is not set.
   registry->RegisterBooleanPref(prefs::kComponentUpdatesEnabled, true);
 }
 
 scoped_refptr<update_client::Configurator>
 MakeChromeComponentUpdaterConfigurator(
     const base::CommandLine* cmdline,
     net::URLRequestContextGetter* context_getter,
     PrefService* pref_service) {
   return base::MakeRefCounted<ChromeConfigurator>(cmdline, context_getter,
                                                   pref_service);
 }
 
 }  // namespace component_updater