| OLD | NEW |
| 1 // Copyright (c) 2017 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2017 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "services/preferences/public/cpp/pref_service_factory.h" | 5 #include "services/preferences/public/cpp/pref_service_factory.h" |
| 6 | 6 |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/test/sequenced_worker_pool_owner.h" | 10 #include "base/test/sequenced_worker_pool_owner.h" |
| 11 #include "components/prefs/pref_change_registrar.h" | 11 #include "components/prefs/pref_change_registrar.h" |
| 12 #include "components/prefs/pref_registry_simple.h" | 12 #include "components/prefs/pref_registry_simple.h" |
| 13 #include "components/prefs/pref_service.h" | 13 #include "components/prefs/pref_service.h" |
| 14 #include "mojo/public/cpp/bindings/binding_set.h" | 14 #include "mojo/public/cpp/bindings/binding_set.h" |
| 15 #include "services/preferences/public/cpp/pref_store_manager_impl.h" | 15 #include "services/preferences/public/cpp/pref_service_main.h" |
| 16 #include "services/preferences/public/interfaces/preferences.mojom.h" | 16 #include "services/preferences/public/interfaces/preferences.mojom.h" |
| 17 #include "services/service_manager/public/cpp/interface_factory.h" | 17 #include "services/service_manager/public/cpp/interface_factory.h" |
| 18 #include "services/service_manager/public/cpp/interface_registry.h" | 18 #include "services/service_manager/public/cpp/interface_registry.h" |
| 19 #include "services/service_manager/public/cpp/service_context.h" | 19 #include "services/service_manager/public/cpp/service_context.h" |
| 20 #include "services/service_manager/public/cpp/service_test.h" | 20 #include "services/service_manager/public/cpp/service_test.h" |
| 21 #include "services/service_manager/public/interfaces/service_factory.mojom.h" | 21 #include "services/service_manager/public/interfaces/service_factory.mojom.h" |
| 22 | 22 |
| 23 namespace prefs { | 23 namespace prefs { |
| 24 namespace { | 24 namespace { |
| 25 | 25 |
| (...skipping 11 matching lines...) Expand all Loading... |
| 37 bool OnConnect(const service_manager::ServiceInfo& remote_info, | 37 bool OnConnect(const service_manager::ServiceInfo& remote_info, |
| 38 service_manager::InterfaceRegistry* registry) override { | 38 service_manager::InterfaceRegistry* registry) override { |
| 39 registry->AddInterface<service_manager::mojom::ServiceFactory>(this); | 39 registry->AddInterface<service_manager::mojom::ServiceFactory>(this); |
| 40 return true; | 40 return true; |
| 41 } | 41 } |
| 42 | 42 |
| 43 void CreateService(service_manager::mojom::ServiceRequest request, | 43 void CreateService(service_manager::mojom::ServiceRequest request, |
| 44 const std::string& name) override { | 44 const std::string& name) override { |
| 45 if (name == prefs::mojom::kPrefStoreServiceName) { | 45 if (name == prefs::mojom::kPrefStoreServiceName) { |
| 46 pref_service_context_.reset(new service_manager::ServiceContext( | 46 pref_service_context_.reset(new service_manager::ServiceContext( |
| 47 base::MakeUnique<prefs::PrefStoreManagerImpl>( | 47 CreatePrefService(std::set<PrefValueStore::PrefStoreType>(), |
| 48 prefs::PrefStoreManagerImpl::PrefStoreTypes(), worker_pool_), | 48 worker_pool_), |
| 49 std::move(request))); | 49 std::move(request))); |
| 50 } | 50 } |
| 51 } | 51 } |
| 52 | 52 |
| 53 void Create(const service_manager::Identity& remote_identity, | 53 void Create(const service_manager::Identity& remote_identity, |
| 54 service_manager::mojom::ServiceFactoryRequest request) override { | 54 service_manager::mojom::ServiceFactoryRequest request) override { |
| 55 service_factory_bindings_.AddBinding(this, std::move(request)); | 55 service_factory_bindings_.AddBinding(this, std::move(request)); |
| 56 } | 56 } |
| 57 | 57 |
| 58 private: | 58 private: |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 | 171 |
| 172 // TODO(tibell): Once we have a default store check the value prior to | 172 // TODO(tibell): Once we have a default store check the value prior to |
| 173 // setting. | 173 // setting. |
| 174 pref_service->SetInteger(kKey, kUpdatedValue); | 174 pref_service->SetInteger(kKey, kUpdatedValue); |
| 175 WaitForPrefChange(pref_service2.get(), kKey); | 175 WaitForPrefChange(pref_service2.get(), kKey); |
| 176 EXPECT_EQ(kUpdatedValue, pref_service2->GetInteger(kKey)); | 176 EXPECT_EQ(kUpdatedValue, pref_service2->GetInteger(kKey)); |
| 177 } | 177 } |
| 178 | 178 |
| 179 } // namespace | 179 } // namespace |
| 180 } // namespace prefs | 180 } // namespace prefs |
| OLD | NEW |