Move PrefStoreManagerImpl into //services/preferences.

services/preferences/pref_store_manager_impl.h

Index: services/preferences/pref_store_manager_impl.h
diff --git a/services/preferences/public/cpp/pref_store_manager_impl.h b/services/preferences/pref_store_manager_impl.h
similarity index 91%
rename from services/preferences/public/cpp/pref_store_manager_impl.h
rename to services/preferences/pref_store_manager_impl.h
index 07961579deea37f184d9e46b8125ae83a76c212e..16cf904bed2cc1a29da477968552720bb9beacc7 100644
--- a/services/preferences/public/cpp/pref_store_manager_impl.h
+++ b/services/preferences/pref_store_manager_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_PREFERENCES_PUBLIC_CPP_PREF_STORE_MANAGER_IMPL_H_
-#define SERVICES_PREFERENCES_PUBLIC_CPP_PREF_STORE_MANAGER_IMPL_H_
+#ifndef SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_
+#define SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_
 
 #include <memory>
 #include <set>
@@ -45,8 +45,9 @@ class PrefStoreManagerImpl
 
   // Only replies to Connect calls when all |expected_pref_stores| have
   // registered.
-  PrefStoreManagerImpl(PrefStoreTypes expected_pref_stores,
-                       scoped_refptr<base::SequencedWorkerPool> worker_pool);
+  PrefStoreManagerImpl(
+      std::set<PrefValueStore::PrefStoreType> expected_pref_stores,
+      scoped_refptr<base::SequencedWorkerPool> worker_pool);
   ~PrefStoreManagerImpl() override;
 
  private:
@@ -92,7 +93,7 @@ class PrefStoreManagerImpl
   bool AllConnected() const;
 
   // PrefStores that need to register before replying to any Connect calls.
-  PrefStoreTypes expected_pref_stores_;
+  std::set<PrefValueStore::PrefStoreType> expected_pref_stores_;
 
   // Registered pref stores.
   PrefStorePtrs pref_store_ptrs_;
@@ -120,4 +121,4 @@ class PrefStoreManagerImpl
 
 }  // namespace prefs
 
-#endif  // SERVICES_PREFERENCES_PUBLIC_CPP_PREF_STORE_MANAGER_IMPL_H_
+#endif  // SERVICES_PREFERENCES_PREF_STORE_MANAGER_IMPL_H_