Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(414)

Side by Side Diff: content/browser/service_manager/service_manager_context.cc

Issue 2557213002: Build services as standalone executables (Closed)
Patch Set: remove DCHECKs with side effects -_- Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/test/base/mojo_test_connector.cc ('k') | services/catalog/reader.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "content/browser/service_manager/service_manager_context.h" 5 #include "content/browser/service_manager/service_manager_context.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 19 matching lines...) Expand all
30 #include "services/catalog/manifest_provider.h" 30 #include "services/catalog/manifest_provider.h"
31 #include "services/catalog/public/interfaces/constants.mojom.h" 31 #include "services/catalog/public/interfaces/constants.mojom.h"
32 #include "services/catalog/store.h" 32 #include "services/catalog/store.h"
33 #include "services/file/public/interfaces/constants.mojom.h" 33 #include "services/file/public/interfaces/constants.mojom.h"
34 #include "services/service_manager/connect_params.h" 34 #include "services/service_manager/connect_params.h"
35 #include "services/service_manager/native_runner.h" 35 #include "services/service_manager/native_runner.h"
36 #include "services/service_manager/public/cpp/connector.h" 36 #include "services/service_manager/public/cpp/connector.h"
37 #include "services/service_manager/public/cpp/service.h" 37 #include "services/service_manager/public/cpp/service.h"
38 #include "services/service_manager/public/interfaces/service.mojom.h" 38 #include "services/service_manager/public/interfaces/service.mojom.h"
39 #include "services/service_manager/runner/common/client_util.h" 39 #include "services/service_manager/runner/common/client_util.h"
40 #include "services/service_manager/runner/host/in_process_native_runner.h"
41 #include "services/service_manager/service_manager.h" 40 #include "services/service_manager/service_manager.h"
42 41
43 namespace content { 42 namespace content {
44 43
45 namespace { 44 namespace {
46 45
47 base::LazyInstance<std::unique_ptr<service_manager::Connector>>::Leaky 46 base::LazyInstance<std::unique_ptr<service_manager::Connector>>::Leaky
48 g_io_thread_connector = LAZY_INSTANCE_INITIALIZER; 47 g_io_thread_connector = LAZY_INSTANCE_INITIALIZER;
49 48
50 void DestroyConnectorOnIOThread() { g_io_thread_connector.Get().reset(); } 49 void DestroyConnectorOnIOThread() { g_io_thread_connector.Get().reset(); }
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 std::unique_ptr<base::Value> GetManifest(const std::string& name) override { 126 std::unique_ptr<base::Value> GetManifest(const std::string& name) override {
128 auto it = manifests_.find(name); 127 auto it = manifests_.find(name);
129 return it != manifests_.end() ? it->second->CreateDeepCopy() : nullptr; 128 return it != manifests_.end() ? it->second->CreateDeepCopy() : nullptr;
130 } 129 }
131 130
132 std::map<std::string, std::unique_ptr<base::Value>> manifests_; 131 std::map<std::string, std::unique_ptr<base::Value>> manifests_;
133 132
134 DISALLOW_COPY_AND_ASSIGN(BuiltinManifestProvider); 133 DISALLOW_COPY_AND_ASSIGN(BuiltinManifestProvider);
135 }; 134 };
136 135
136 class NullNativeRunnerFactory : public service_manager::NativeRunnerFactory {
137 public:
138 NullNativeRunnerFactory() {}
139 ~NullNativeRunnerFactory() override {}
140
141 std::unique_ptr<service_manager::NativeRunner> Create(
142 const base::FilePath& service_path) override {
143 LOG(ERROR) << "Attempting to run unsupported native service: "
144 << service_path.value();
145 return nullptr;
146 }
147
148 private:
149 DISALLOW_COPY_AND_ASSIGN(NullNativeRunnerFactory);
150 };
151
137 } // namespace 152 } // namespace
138 153
139 // State which lives on the IO thread and drives the ServiceManager. 154 // State which lives on the IO thread and drives the ServiceManager.
140 class ServiceManagerContext::InProcessServiceManagerContext 155 class ServiceManagerContext::InProcessServiceManagerContext
141 : public base::RefCountedThreadSafe<InProcessServiceManagerContext> { 156 : public base::RefCountedThreadSafe<InProcessServiceManagerContext> {
142 public: 157 public:
143 InProcessServiceManagerContext() {} 158 InProcessServiceManagerContext() {}
144 159
145 service_manager::mojom::ServiceRequest Start( 160 service_manager::mojom::ServiceRequest Start(
146 std::unique_ptr<BuiltinManifestProvider> manifest_provider) { 161 std::unique_ptr<BuiltinManifestProvider> manifest_provider) {
(...skipping 20 matching lines...) Expand all
167 friend class base::RefCountedThreadSafe<InProcessServiceManagerContext>; 182 friend class base::RefCountedThreadSafe<InProcessServiceManagerContext>;
168 183
169 ~InProcessServiceManagerContext() {} 184 ~InProcessServiceManagerContext() {}
170 185
171 void StartOnIOThread( 186 void StartOnIOThread(
172 std::unique_ptr<BuiltinManifestProvider> manifest_provider, 187 std::unique_ptr<BuiltinManifestProvider> manifest_provider,
173 service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) { 188 service_manager::mojom::ServicePtrInfo embedder_service_proxy_info) {
174 manifest_provider_ = std::move(manifest_provider); 189 manifest_provider_ = std::move(manifest_provider);
175 190
176 base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool(); 191 base::SequencedWorkerPool* blocking_pool = BrowserThread::GetBlockingPool();
177 std::unique_ptr<service_manager::NativeRunnerFactory> native_runner_factory(
178 new service_manager::InProcessNativeRunnerFactory(blocking_pool));
179 catalog_.reset( 192 catalog_.reset(
180 new catalog::Catalog(blocking_pool, nullptr, manifest_provider_.get())); 193 new catalog::Catalog(blocking_pool, nullptr, manifest_provider_.get()));
181 service_manager_.reset(new service_manager::ServiceManager( 194 service_manager_.reset(new service_manager::ServiceManager(
182 std::move(native_runner_factory), catalog_->TakeService())); 195 base::MakeUnique<NullNativeRunnerFactory>(), catalog_->TakeService()));
183 196
184 service_manager::mojom::ServiceRequest request = 197 service_manager::mojom::ServiceRequest request =
185 service_manager_->StartEmbedderService(mojom::kBrowserServiceName); 198 service_manager_->StartEmbedderService(mojom::kBrowserServiceName);
186 mojo::FuseInterface( 199 mojo::FuseInterface(
187 std::move(request), std::move(embedder_service_proxy_info)); 200 std::move(request), std::move(embedder_service_proxy_info));
188 } 201 }
189 202
190 void ShutDownOnIOThread() { 203 void ShutDownOnIOThread() {
191 service_manager_.reset(); 204 service_manager_.reset();
192 catalog_.reset(); 205 catalog_.reset();
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 base::Bind(&DestroyConnectorOnIOThread)); 324 base::Bind(&DestroyConnectorOnIOThread));
312 } 325 }
313 326
314 // static 327 // static
315 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() { 328 service_manager::Connector* ServiceManagerContext::GetConnectorForIOThread() {
316 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 329 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
317 return g_io_thread_connector.Get().get(); 330 return g_io_thread_connector.Get().get();
318 } 331 }
319 332
320 } // namespace content 333 } // namespace content
OLDNEW
« no previous file with comments | « chrome/test/base/mojo_test_connector.cc ('k') | services/catalog/reader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698