Pref service: have Mash and Chrome connect to the right pref stores

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/browser/prefs/browser_prefs.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 "services/preferences/public/cpp/persistent_pref_store_client.h"
 #include "services/preferences/public/interfaces/preferences.mojom.h"
 #include "services/preferences/tracked/pref_hash_filter.h"
 #include "services/preferences/tracked/pref_hash_store_impl.h"
@@ skipping 82 matching lines @@
 PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
     const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
     const base::Closure& on_reset_on_load,
     prefs::mojom::TrackedPreferenceValidationDelegate* validation_delegate,
     service_manager::Connector* connector,
     scoped_refptr<PrefRegistry> pref_registry) {
   if (features::PrefServiceEnabled()) {
     ConfigurePrefService(on_reset_on_load, connector);
     prefs::mojom::PrefStoreConnectorPtr pref_connector;
     connector->BindInterface(prefs::mojom::kServiceName, &pref_connector);
+    auto in_process_types_set = chrome::InProcessPrefStores();
+    std::vector<PrefValueStore::PrefStoreType> in_process_types;

[Sam McNally, 2017/04/03 10:09:31]

in_process_types(in_process_types_set.begin(), in_process_types_set.end());

[tibell, 2017/04/04 04:05:59]

Done.

+    std::copy(in_process_types_set.begin(), in_process_types_set.end(),
+              std::back_inserter(in_process_types));
     return new prefs::PersistentPrefStoreClient(std::move(pref_connector),
-                                                std::move(pref_registry));
+                                                std::move(pref_registry),
+                                                std::move(in_process_types));
   }
   if (!kPlatformSupportsPreferenceTracking) {
     return new JsonPrefStore(profile_path_.Append(chrome::kPreferencesFilename),
                              io_task_runner.get(),
                              std::unique_ptr<PrefFilter>());
   }
 
   std::vector<prefs::mojom::TrackedPreferenceMetadataPtr>
       unprotected_configuration;
   std::vector<prefs::mojom::TrackedPreferenceMetadataPtr>
@@ skipping 111 matching lines @@
     const base::Closure& on_reset_on_load,
     service_manager::Connector* connector) {
   auto config = prefs::mojom::PersistentPrefStoreConfiguration::New();
   config->set_simple_configuration(
       prefs::mojom::SimplePersistentPrefStoreConfiguration::New(
           profile_path_.Append(chrome::kPreferencesFilename)));
   prefs::mojom::PrefServiceControlPtr control;
   connector->BindInterface(prefs::mojom::kServiceName, &control);
   control->Init(std::move(config));
 }