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

Side by Side Diff: content/browser/child_process_launcher_helper_posix.cc

Issue 2763883002: Revert of Move some basic early process init into Service Manager (Closed)
Patch Set: Created 3 years, 9 months 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 | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/sandbox_ipc_linux.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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 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 "content/browser/child_process_launcher_helper_posix.h" 5 #include "content/browser/child_process_launcher_helper_posix.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/field_trial.h" 8 #include "base/metrics/field_trial.h"
9 #include "base/posix/global_descriptors.h" 9 #include "base/posix/global_descriptors.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
12 #include "content/browser/file_descriptor_info_impl.h" 12 #include "content/browser/file_descriptor_info_impl.h"
13 #include "content/public/browser/content_browser_client.h" 13 #include "content/public/browser/content_browser_client.h"
14 #include "content/public/common/content_client.h" 14 #include "content/public/common/content_client.h"
15 #include "content/public/common/content_descriptors.h" 15 #include "content/public/common/content_descriptors.h"
16 #include "content/public/common/content_switches.h" 16 #include "content/public/common/content_switches.h"
17 #include "mojo/edk/embedder/platform_handle.h" 17 #include "mojo/edk/embedder/platform_handle.h"
18 #include "services/catalog/public/cpp/manifest_parsing_util.h" 18 #include "services/catalog/public/cpp/manifest_parsing_util.h"
19 #include "services/service_manager/embedder/shared_file_util.h" 19 #include "services/service_manager/public/cpp/shared_file_util.h"
20 #include "services/service_manager/embedder/switches.h"
21 20
22 namespace content { 21 namespace content {
23 namespace internal { 22 namespace internal {
24 23
25 namespace { 24 namespace {
26 25
27 using RequiredFilesByServiceMap = 26 using RequiredFilesByServiceMap =
28 std::map<std::string, catalog::RequiredFileMap>; 27 std::map<std::string, catalog::RequiredFileMap>;
29 28
30 RequiredFilesByServiceMap& GetRequiredFilesByServiceMap() { 29 RequiredFilesByServiceMap& GetRequiredFilesByServiceMap() {
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 DCHECK(GetRequiredFilesByServiceMap().count(service_name) == 0); 140 DCHECK(GetRequiredFilesByServiceMap().count(service_name) == 0);
142 GetRequiredFilesByServiceMap()[service_name] = std::move(required_files); 141 GetRequiredFilesByServiceMap()[service_name] = std::move(required_files);
143 } 142 }
144 143
145 void ResetFilesToShareForTestingPosix() { 144 void ResetFilesToShareForTestingPosix() {
146 GetRequiredFilesByServiceMap().clear(); 145 GetRequiredFilesByServiceMap().clear();
147 } 146 }
148 147
149 } // namespace internal 148 } // namespace internal
150 } // namespace content 149 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/BUILD.gn ('k') | content/browser/renderer_host/sandbox_ipc_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698