Add a mojo bridge for PersistentPrefStore.

chrome/browser/prefs/profile_pref_store_manager.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/prefs/profile_pref_store_manager.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #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"
 #include "components/prefs/pref_registry_simple.h"
 #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_mojo.h"
+#include "services/preferences/public/cpp/user_prefs_impl.h"
 
 #if defined(OS_WIN)
 #include "chrome/installer/util/browser_distribution.h"
 #include "components/user_prefs/tracked/registry_hash_store_contents_win.h"
 #endif
 
 namespace {
 
 void RemoveValueSilently(const base::WeakPtr<JsonPrefStore> pref_store,
                          const std::string& key) {
@@ skipping 57 matching lines @@
 #if defined(OS_WIN)
 // static
 void ProfilePrefStoreManager::SetPreferenceValidationRegistryPathForTesting(
     const base::string16* path) {
   DCHECK(!path->empty());
   g_preference_validation_registry_path_for_testing = path;
 }
 #endif  // OS_WIN
 
 PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
+    const scoped_refptr<base::SingleThreadTaskRunner>& pref_task_runner,
     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
     const base::Closure& on_reset_on_load,
-    prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate) {
-  std::unique_ptr<PrefFilter> pref_filter;
+    std::unique_ptr<prefs::mojom::TrackedPreferenceValidationDelegate>*
+        validation_delegate) {
+  DCHECK(validation_delegate);

[tibell, 2017/03/08 03:39:54]

Split this whole block out into a CreateProfilePrefStoreUsingService and call
that.

+  prefs::mojom::PersistentPrefStoreConnectorPtr connector;
+  if (base::FeatureList::IsEnabled(features::kPrefService)) {
+    if (!kPlatformSupportsPreferenceTracking) {
+      prefs::CreateUserPrefs(profile_path_.Append(chrome::kPreferencesFilename),
+                             pref_task_runner, io_task_runner,
+                             mojo::MakeRequest(&connector));
+    } else {
+      prefs::mojom::TrackedPreferenceValidationDelegatePtr
+          validation_delegate_ptr;
+      if (*validation_delegate) {
+        mojo::MakeStrongBinding(std::move(*validation_delegate),
+                                mojo::MakeRequest(&validation_delegate_ptr));
+      }
+      prefs::CreateSegregatedUserPrefs(
+          profile_path_.Append(chrome::kPreferencesFilename),
+          profile_path_.Append(chrome::kSecurePreferencesFilename),
+          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
+              : BrowserDistribution::GetDistribution()->GetRegistryPath(),
+#else
+          base::string16(),
+#endif
+          std::move(validation_delegate_ptr), on_reset_on_load,
+          pref_task_runner, io_task_runner, mojo::MakeRequest(&connector));
+    }
+    return new prefs::PersistentPrefStoreMojo(std::move(connector));
+  }
   if (!kPlatformSupportsPreferenceTracking) {
     return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename),
                              io_task_runner.get(),
                              std::unique_ptr<PrefFilter>());
   }
 
   std::vector<PrefHashFilter::TrackedPreferenceMetadata>
       unprotected_configuration;
   std::vector<PrefHashFilter::TrackedPreferenceMetadata>
       protected_configuration;
   std::set<std::string> protected_pref_names;
   std::set<std::string> unprotected_pref_names;
   for (std::vector<PrefHashFilter::TrackedPreferenceMetadata>::const_iterator
            it = tracking_configuration_.begin();
        it != tracking_configuration_.end();
        ++it) {
     if (it->enforcement_level > PrefHashFilter::NO_ENFORCEMENT) {
       protected_configuration.push_back(*it);
       protected_pref_names.insert(it->name);
     } else {
       unprotected_configuration.push_back(*it);
       unprotected_pref_names.insert(it->name);
     }
   }
 
   std::unique_ptr<PrefHashFilter> unprotected_pref_hash_filter(
-      new PrefHashFilter(GetPrefHashStore(false),
-                         GetExternalVerificationPrefHashStorePair(),
-                         unprotected_configuration, base::Closure(),
-                         validation_delegate, reporting_ids_count_, false));
+      new PrefHashFilter(
+          GetPrefHashStore(false), GetExternalVerificationPrefHashStorePair(),
+          unprotected_configuration, base::Closure(),
+          validation_delegate->get(), reporting_ids_count_, false));
   std::unique_ptr<PrefHashFilter> protected_pref_hash_filter(new PrefHashFilter(
       GetPrefHashStore(true), GetExternalVerificationPrefHashStorePair(),
-      protected_configuration, on_reset_on_load, validation_delegate,
+      protected_configuration, on_reset_on_load, validation_delegate->get(),
       reporting_ids_count_, true));
 
   PrefHashFilter* raw_unprotected_pref_hash_filter =
       unprotected_pref_hash_filter.get();
   PrefHashFilter* raw_protected_pref_hash_filter =
       protected_pref_hash_filter.get();
 
   scoped_refptr<JsonPrefStore> unprotected_pref_store(new JsonPrefStore(
       profile_path_.Append(chrome::kPreferencesFilename), io_task_runner.get(),
       std::move(unprotected_pref_hash_filter)));
@@ skipping 70 matching lines @@
           ? base::MakeUnique<RegistryHashStoreContentsWin>(
                 *g_preference_validation_registry_path_for_testing,
                 profile_path_.BaseName().LossyDisplayName())
           : base::MakeUnique<RegistryHashStoreContentsWin>(
                 BrowserDistribution::GetDistribution()->GetRegistryPath(),
                 profile_path_.BaseName().LossyDisplayName()));
 #else
   return std::make_pair(nullptr, nullptr);
 #endif
 }