Pref service: enable for user prefs in chrome behind a flag.

chrome/browser/prefs/profile_pref_store_manager.cc

Index: chrome/browser/prefs/profile_pref_store_manager.cc
diff --git a/chrome/browser/prefs/profile_pref_store_manager.cc b/chrome/browser/prefs/profile_pref_store_manager.cc
index ac8f1dc2bb5189505649de51d888c08f6cfdc6b6..cb51902a2ee0cb56363c05c132b1868f44c0c643 100644
--- a/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -16,6 +16,7 @@
 #include "base/sequenced_task_runner.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/chrome_features.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/json_pref_store.h"
 #include "components/prefs/persistent_pref_store.h"
@@ -23,8 +24,13 @@
 #include "components/user_prefs/tracked/pref_hash_store_impl.h"
 #include "components/user_prefs/tracked/segregated_pref_store.h"
 #include "components/user_prefs/tracked/tracked_preferences_migration.h"
+#include "mojo/public/cpp/bindings/strong_binding.h"
+#include "services/preferences/public/cpp/persistent_pref_store_client.h"
 #include "services/preferences/public/cpp/tracked_persistent_pref_store_factory.h"
+#include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/preferences/public/interfaces/preferences_configuration.mojom.h"
+#include "services/preferences/public/interfaces/tracked_preference_validation_delegate.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
 
 #if defined(OS_WIN)
 #include "chrome/install_static/install_util.h"
@@ -40,6 +46,33 @@ const base::string16* g_preference_validation_registry_path_for_testing =
     nullptr;
 #endif  // OS_WIN
 
+class ResetOnLoadObserverImpl : public prefs::mojom::ResetOnLoadObserver {
+ public:
+  explicit ResetOnLoadObserverImpl(const base::Closure& on_reset_on_load)
+      : on_reset_on_load_(on_reset_on_load) {
+    DCHECK(on_reset_on_load_);
+  }
+
+  void OnResetOnLoad() override { on_reset_on_load_.Run(); }
+
+ private:
+  base::Closure on_reset_on_load_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResetOnLoadObserverImpl);
+};
+
+std::vector<prefs::mojom::TrackedPreferenceMetadataPtr>
+WrapTrackedPreferenceMetadata(
+    const std::vector<PrefHashFilter::TrackedPreferenceMetadata>& input) {
+  std::vector<prefs::mojom::TrackedPreferenceMetadataPtr> output;
+  for (const auto& metadata : input) {
+    output.emplace_back(base::in_place, metadata.reporting_id, metadata.name,
+                        metadata.enforcement_level, metadata.strategy,
+                        metadata.value_type);
+  }
+  return output;
+}
+
 }  // namespace
 
 // Preference tracking and protection is not required on platforms where other
@@ -96,7 +129,18 @@ void ProfilePrefStoreManager::SetPreferenceValidationRegistryPathForTesting(
 PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
     scoped_refptr<base::SequencedTaskRunner> io_task_runner,
     const base::Closure& on_reset_on_load,
-    prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate) {
+    std::unique_ptr<prefs::mojom::TrackedPreferenceValidationDelegate>*
+        validation_delegate,
+    service_manager::Connector* connector) {
+  DCHECK(validation_delegate);
+  if (base::FeatureList::IsEnabled(features::kPrefService)) {
+    ConfigurePrefService(on_reset_on_load, std::move(*validation_delegate),
+                         connector);
+    prefs::mojom::PersistentPrefStoreConnectorPtr pref_connector;
+    connector->BindInterface(prefs::mojom::kPrefStoreServiceName,
+                             &pref_connector);
+    return new prefs::PersistentPrefStoreClient(std::move(pref_connector));
+  }
   if (!kPlatformSupportsPreferenceTracking) {
     return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename),
                              io_task_runner, std::unique_ptr<PrefFilter>());
@@ -113,7 +157,7 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
 #else
       base::string16(),
 #endif
-      validation_delegate, on_reset_on_load);
+      validation_delegate->get(), on_reset_on_load);
 }
 
 bool ProfilePrefStoreManager::InitializePrefsFromMasterPrefs(
@@ -173,3 +217,47 @@ ProfilePrefStoreManager::GetExternalVerificationPrefHashStorePair() {
   return std::make_pair(nullptr, nullptr);
 #endif
 }
+
+void ProfilePrefStoreManager::ConfigurePrefService(
+    const base::Closure& on_reset_on_load,
+    std::unique_ptr<prefs::mojom::TrackedPreferenceValidationDelegate>
+        validation_delegate,
+    service_manager::Connector* connector) {
+  auto config = prefs::mojom::PersistentPrefStoreConfiguration::New();
+  if (!kPlatformSupportsPreferenceTracking) {
+    config->set_simple_configuration(
+        prefs::mojom::SimplePersistentPrefStoreConfiguration::New(
+            profile_path_.Append(chrome::kPreferencesFilename)));
+  } else {
+    prefs::mojom::TrackedPreferenceValidationDelegatePtr
+        validation_delegate_ptr;
+    if (validation_delegate) {
+      mojo::MakeStrongBinding(std::move(validation_delegate),
+                              mojo::MakeRequest(&validation_delegate_ptr));
+    }
+    prefs::mojom::ResetOnLoadObserverPtr reset_on_load_observer;
+    if (on_reset_on_load) {
+      mojo::MakeStrongBinding(
+          base::MakeUnique<ResetOnLoadObserverImpl>(on_reset_on_load),
+          mojo::MakeRequest(&reset_on_load_observer));
+    }
+    config->set_tracked_configuration(
+        prefs::mojom::TrackedPersistentPrefStoreConfiguration::New(
+            profile_path_.Append(chrome::kPreferencesFilename),
+            profile_path_.Append(chrome::kSecurePreferencesFilename),
+            WrapTrackedPreferenceMetadata(tracking_configuration_),
+            reporting_ids_count_, seed_, legacy_device_id_,
+#if defined(OS_WIN)
+            g_preference_validation_registry_path_for_testing
+                ? *g_preference_validation_registry_path_for_testing
+                : install_static::GetRegistryPath(),
+#else
+            base::string16(),
+#endif
+            std::move(validation_delegate_ptr),
+            std::move(reset_on_load_observer)));
+  }
+  prefs::mojom::PrefServiceControlPtr control;
+  connector->BindInterface(prefs::mojom::kPrefStoreServiceName, &control);
+  control->Init(std::move(config));
+}