Skip to content

Commit 4e805fd

Browse files
krockotCommit Bot
krockot
authored and
Commit Bot
committed
Reland "Delete service_manager/embedder/switches.h"
This is a reland of 1809671 No interesting changes, just updated to resolve a compile-breaking collision with another CL that landed earlier today. (see PS3) Original change's description: > Delete service_manager/embedder/switches.h > > Each switch is either deleted because it's no longer used, or migrated > to a more appropriate layer (generally Content). > > Bug: 977637 > Change-Id: I9c4a74d4d99f4f7e7df8319d95b4ac4f55f11165 > Tbr: caseq@chromium.org > Tbr: dschuff@chromium.org > Tbr: finnur@chromium.org > Tbr: halliwell@chromium.org > Tbr: wez@chromium.org > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440908 > Commit-Queue: Ken Rockot <rockot@google.com> > Reviewed-by: Avi Drissman <avi@chromium.org> > Reviewed-by: Robert Sesek <rsesek@chromium.org> > Cr-Commit-Position: refs/heads/master@{#812318} Bug: 977637 Change-Id: Ia33b2999f531e7504456b4b71d3b5e571af3a354 Tbr: caseq@chromium.org Tbr: dschuff@chromium.org Tbr: finnur@chromium.org Tbr: halliwell@chromium.org Tbr: rsesek@chromium.org Tbr: wez@chromium.org Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2440974 Commit-Queue: Ken Rockot <rockot@google.com> Reviewed-by: Avi Drissman <avi@chromium.org> Cr-Commit-Position: refs/heads/master@{#812531}
1 parent d7bf87e commit 4e805fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+90
-231
lines changed

‎chrome/app/chrome_crash_reporter_client.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "chrome/installer/util/google_update_settings.h"
2323
#include "components/crash/core/common/crash_keys.h"
2424
#include "content/public/common/content_switches.h"
25-
#include "services/service_manager/embedder/switches.h"
2625

2726
#if defined(OS_POSIX) && !defined(OS_MAC)
2827
#include "components/upload_list/crash_upload_list.h"
@@ -76,7 +75,7 @@ bool ChromeCrashReporterClient::ShouldPassCrashLoopBefore(
7675
if (process_type == ::switches::kRendererProcess ||
7776
process_type == ::switches::kUtilityProcess ||
7877
process_type == ::switches::kPpapiPluginProcess ||
79-
process_type == service_manager::switches::kZygoteProcess) {
78+
process_type == ::switches::kZygoteProcess) {
8079
// These process types never cause a log-out, even if they crash. So the
8180
// normal crash handling process should work fine; we shouldn't need to
8281
// invoke the special crash-loop mode.
@@ -212,7 +211,7 @@ bool ChromeCrashReporterClient::EnableBreakpadForProcess(
212211
const std::string& process_type) {
213212
return process_type == switches::kRendererProcess ||
214213
process_type == switches::kPpapiPluginProcess ||
215-
process_type == service_manager::switches::kZygoteProcess ||
214+
process_type == switches::kZygoteProcess ||
216215
process_type == switches::kGpuProcess ||
217216
process_type == switches::kUtilityProcess;
218217
}

‎chrome/app/chrome_main_delegate.cc

+6-8
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
#include "pdf/buildflags.h"
7070
#include "ppapi/buildflags/buildflags.h"
7171
#include "printing/buildflags/buildflags.h"
72-
#include "services/service_manager/embedder/switches.h"
7372
#include "services/tracing/public/cpp/stack_sampling/tracing_sampler_profiler.h"
7473
#include "ui/base/resource/resource_bundle.h"
7574
#include "ui/base/ui_base_switches.h"
@@ -275,8 +274,7 @@ void AdjustLinuxOOMScore(const std::string& process_type) {
275274
process_type == switches::kNaClLoaderNonSfiProcess) {
276275
score = content::kPluginOomScore;
277276
#endif
278-
} else if (process_type == service_manager::switches::kZygoteProcess ||
279-
process_type.empty()) {
277+
} else if (process_type == switches::kZygoteProcess || process_type.empty()) {
280278
// For zygotes and unlabeled process types, we want to still make
281279
// them killable by the OOM killer.
282280
score = content::kZygoteOomScore;
@@ -304,7 +302,7 @@ bool SubprocessNeedsResourceBundle(const std::string& process_type) {
304302
return
305303
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
306304
// The zygote process opens the resources for the renderers.
307-
process_type == service_manager::switches::kZygoteProcess ||
305+
process_type == switches::kZygoteProcess ||
308306
#endif
309307
#if defined(OS_MAC)
310308
// Mac needs them too for scrollbar related images and for sandbox
@@ -980,13 +978,13 @@ void ChromeMainDelegate::PreSandboxStartup() {
980978
// browser process as a command line flag.
981979
#if !BUILDFLAG(ENABLE_NACL)
982980
DCHECK(command_line.HasSwitch(switches::kLang) ||
983-
process_type == service_manager::switches::kZygoteProcess ||
981+
process_type == switches::kZygoteProcess ||
984982
process_type == switches::kGpuProcess ||
985983
process_type == switches::kPpapiBrokerProcess ||
986984
process_type == switches::kPpapiPluginProcess);
987985
#else
988986
DCHECK(command_line.HasSwitch(switches::kLang) ||
989-
process_type == service_manager::switches::kZygoteProcess ||
987+
process_type == switches::kZygoteProcess ||
990988
process_type == switches::kGpuProcess ||
991989
process_type == switches::kNaClLoaderProcess ||
992990
process_type == switches::kPpapiBrokerProcess ||
@@ -1000,7 +998,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
1000998
// this value could be passed in a different way.
1001999
std::string locale = command_line.GetSwitchValueASCII(switches::kLang);
10021000
#if defined(OS_CHROMEOS)
1003-
if (process_type == service_manager::switches::kZygoteProcess) {
1001+
if (process_type == switches::kZygoteProcess) {
10041002
DCHECK(locale.empty());
10051003
// See comment at ReadAppLocale() for why we do this.
10061004
locale = chromeos::startup_settings_cache::ReadAppLocale();
@@ -1060,7 +1058,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
10601058

10611059
#if defined(OS_POSIX) && !defined(OS_MAC)
10621060
// Zygote needs to call InitCrashReporter() in RunZygote().
1063-
if (process_type != service_manager::switches::kZygoteProcess) {
1061+
if (process_type != switches::kZygoteProcess) {
10641062
#if defined(OS_ANDROID)
10651063
crash_reporter::InitializeCrashpad(process_type.empty(), process_type);
10661064
if (process_type.empty()) {

‎chrome/browser/chrome_content_browser_client.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@
345345
#include "services/network/public/cpp/is_potentially_trustworthy.h"
346346
#include "services/network/public/cpp/network_switches.h"
347347
#include "services/network/public/cpp/resource_request.h"
348-
#include "services/service_manager/embedder/switches.h"
349348
#include "services/strings/grit/services_strings.h"
350349
#include "storage/browser/file_system/external_mount_points.h"
351350
#include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h"
@@ -2385,7 +2384,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLineSwitches(
23852384
base::size(kSwitchNames));
23862385
#endif
23872386
MaybeAppendSecureOriginsAllowlistSwitch(command_line);
2388-
} else if (process_type == service_manager::switches::kZygoteProcess) {
2387+
} else if (process_type == switches::kZygoteProcess) {
23892388
static const char* const kSwitchNames[] = {
23902389
// Load (in-process) Pepper plugins in-process in the zygote pre-sandbox.
23912390
switches::kDisableBundledPpapiFlash,

‎chrome/browser/metrics/metrics_service_browsertest.cc

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
#include "components/metrics/persistent_histograms.h"
3636
#include "components/prefs/json_pref_store.h"
3737
#include "components/prefs/pref_service.h"
38+
#include "content/public/common/content_switches.h"
3839
#include "content/public/test/browser_test.h"
3940
#include "content/public/test/browser_test_utils.h"
4041
#include "net/base/filename_util.h"
41-
#include "services/service_manager/embedder/switches.h"
4242
#include "testing/gmock/include/gmock/gmock-matchers.h"
4343
#include "testing/gmock/include/gmock/gmock.h"
4444
#include "ui/base/window_open_disposition.h"
@@ -261,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(MetricsServiceBrowserTest, OOMRenderers) {
261261
// Disable stack traces during this test since DbgHelp is unreliable in
262262
// low-memory conditions (see crbug.com/692564).
263263
base::CommandLine::ForCurrentProcess()->AppendSwitch(
264-
service_manager::switches::kDisableInProcessStackTraces);
264+
switches::kDisableInProcessStackTraces);
265265

266266
base::HistogramTester histogram_tester;
267267

‎chrome/browser/metrics/oom/out_of_memory_reporter_browsertest.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
#include "chrome/test/base/in_process_browser_test.h"
1717
#include "chrome/test/base/ui_test_utils.h"
1818
#include "content/public/browser/navigation_controller.h"
19+
#include "content/public/common/content_switches.h"
1920
#include "content/public/common/url_constants.h"
2021
#include "content/public/test/browser_test.h"
2122
#include "content/public/test/no_renderer_crashes_assertion.h"
2223
#include "content/public/test/test_navigation_observer.h"
2324
#include "net/test/embedded_test_server/embedded_test_server.h"
24-
#include "services/service_manager/embedder/switches.h"
2525
#include "testing/gtest/include/gtest/gtest.h"
2626
#include "third_party/blink/public/common/features.h"
2727
#include "url/gurl.h"
@@ -57,8 +57,7 @@ class MAYBE_OutOfMemoryReporterBrowserTest
5757
void SetUpCommandLine(base::CommandLine* command_line) override {
5858
// Disable stack traces during this test since DbgHelp is unreliable in
5959
// low-memory conditions (see crbug.com/692564).
60-
command_line->AppendSwitch(
61-
service_manager::switches::kDisableInProcessStackTraces);
60+
command_line->AppendSwitch(switches::kDisableInProcessStackTraces);
6261
}
6362

6463
// OutOfMemoryReporter::Observer:

‎chrome/browser/metrics/perf/process_type_collector.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include "base/strings/strcat.h"
1010
#include "base/strings/string_util.h"
1111
#include "content/public/common/content_switches.h"
12-
#include "services/service_manager/embedder/switches.h"
1312
#include "third_party/re2/src/re2/re2.h"
1413

1514
namespace metrics {
@@ -102,7 +101,7 @@ std::map<uint32_t, Process> ProcessTypeCollector::ParseProcessTypes(
102101
process = Process::GPU_PROCESS;
103102
} else if (type == switches::kUtilityProcess) {
104103
process = Process::UTILITY_PROCESS;
105-
} else if (type == service_manager::switches::kZygoteProcess) {
104+
} else if (type == switches::kZygoteProcess) {
106105
process = Process::ZYGOTE_PROCESS;
107106
} else if (type == switches::kPpapiPluginProcess) {
108107
process = Process::PPAPI_PLUGIN_PROCESS;

‎chrome/common/profiler/process_type.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include "content/public/common/content_switches.h"
88
#include "extensions/buildflags/buildflags.h"
99
#include "sandbox/policy/sandbox.h"
10-
#include "services/service_manager/embedder/switches.h"
1110

1211
#if BUILDFLAG(ENABLE_EXTENSIONS)
1312
#include "extensions/common/switches.h"
@@ -50,7 +49,7 @@ metrics::CallStackProfileParams::Process GetProfileParamsProcess(
5049
return metrics::CallStackProfileParams::UTILITY_PROCESS;
5150
}
5251

53-
if (process_type == service_manager::switches::kZygoteProcess)
52+
if (process_type == switches::kZygoteProcess)
5453
return metrics::CallStackProfileParams::ZYGOTE_PROCESS;
5554

5655
if (process_type == switches::kPpapiPluginProcess)

‎chrome/common/profiler/process_type_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ TEST_F(ThreadProfilerProcessTypeTest, GetProfileParamsProcess_Utility) {
7777

7878
TEST_F(ThreadProfilerProcessTypeTest, GetProfileParamsProcess_Zygote) {
7979
command_line().AppendSwitchASCII(switches::kProcessType,
80-
service_manager::switches::kZygoteProcess);
80+
switches::kZygoteProcess);
8181
EXPECT_EQ(metrics::CallStackProfileParams::ZYGOTE_PROCESS,
8282
GetProfileParamsProcess(command_line()));
8383
}

‎chrome/common/profiler/thread_profiler.cc

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "content/public/common/content_switches.h"
3030
#include "content/public/common/service_names.mojom.h"
3131
#include "sandbox/policy/sandbox.h"
32-
#include "services/service_manager/embedder/switches.h"
3332

3433
#if defined(OS_ANDROID) && BUILDFLAG(ENABLE_ARM_CFI_TABLE)
3534
#include <sys/types.h>

‎chromecast/app/cast_main_delegate.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void CastMainDelegate::PreSandboxStartup() {
159159
#elif defined(OS_LINUX) || defined(OS_CHROMEOS)
160160
crash_reporter::SetCrashReporterClient(GetCastCrashReporter());
161161

162-
if (process_type != service_manager::switches::kZygoteProcess) {
162+
if (process_type != switches::kZygoteProcess) {
163163
CastCrashReporterClient::InitCrashReporter(process_type);
164164
}
165165
#endif // defined(OS_LINUX) || defined(OS_CHROMEOS)

‎chromecast/app/linux/cast_crash_reporter_client.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ CastCrashReporterClient::~CastCrashReporterClient() {}
4242
bool CastCrashReporterClient::EnableBreakpadForProcess(
4343
const std::string& process_type) {
4444
return process_type == switches::kRendererProcess ||
45-
process_type == service_manager::switches::kZygoteProcess ||
45+
process_type == switches::kZygoteProcess ||
4646
process_type == switches::kGpuProcess ||
4747
process_type == switches::kUtilityProcess;
4848
}

‎components/crash/core/app/DEPS

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ include_rules = [
77
"+components/gwp_asan/buildflags/buildflags.h",
88
"+components/gwp_asan/crash_handler/crash_handler.h",
99
"+content/public/common/content_descriptors.h",
10-
"+services/service_manager/embedder/switches.h",
1110
"+third_party/crashpad",
1211
"+third_party/lss/linux_syscall_support.h",
1312
]

‎components/nacl/broker/nacl_broker_listener.cc

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include "mojo/public/cpp/system/invitation.h"
3030
#include "mojo/public/cpp/system/message_pipe.h"
3131
#include "sandbox/win/src/sandbox_policy.h"
32-
#include "services/service_manager/embedder/switches.h"
3332

3433
namespace {
3534

‎content/app/android/content_child_process_service_delegate.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "gpu/command_buffer/service/texture_owner.h"
2323
#include "gpu/ipc/common/android/scoped_surface_request_conduit.h"
2424
#include "gpu/ipc/common/gpu_surface_lookup.h"
25-
#include "services/service_manager/embedder/switches.h"
2625
#include "ui/gl/android/scoped_java_surface.h"
2726
#include "ui/gl/android/surface_texture.h"
2827

@@ -157,7 +156,7 @@ void JNI_ContentChildProcessServiceDelegate_RetrieveFileDescriptorsIdsToKeys(
157156
std::map<int, std::string> ids_to_keys;
158157
std::string file_switch_value =
159158
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
160-
service_manager::switches::kSharedFiles);
159+
switches::kSharedFiles);
161160

162161
std::vector<int> ids;
163162
std::vector<std::string> keys;

‎content/app/content_main.cc

+3-5
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include "mojo/public/cpp/platform/platform_channel.h"
4343
#include "mojo/public/cpp/system/dynamic_library_support.h"
4444
#include "sandbox/policy/sandbox_type.h"
45-
#include "services/service_manager/embedder/switches.h"
4645
#include "ui/base/ui_base_paths.h"
4746
#include "ui/base/ui_base_switches.h"
4847

@@ -88,7 +87,7 @@ void SetupSignalHandlers() {
8887
CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN));
8988

9089
if (base::CommandLine::ForCurrentProcess()->HasSwitch(
91-
service_manager::switches::kDisableInProcessStackTraces)) {
90+
switches::kDisableInProcessStackTraces)) {
9291
// Don't interfere with sanitizer signal handlers.
9392
return;
9493
}
@@ -112,7 +111,7 @@ void SetupSignalHandlers() {
112111
void PopulateFDsFromCommandLine() {
113112
const std::string& shared_file_param =
114113
base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
115-
service_manager::switches::kSharedFiles);
114+
switches::kSharedFiles);
116115
if (shared_file_param.empty())
117116
return;
118117

@@ -139,8 +138,7 @@ bool IsSubprocess() {
139138
type == switches::kPpapiBrokerProcess ||
140139
type == switches::kPpapiPluginProcess ||
141140
type == switches::kRendererProcess ||
142-
type == switches::kUtilityProcess ||
143-
type == service_manager::switches::kZygoteProcess;
141+
type == switches::kUtilityProcess || type == switches::kZygoteProcess;
144142
}
145143

146144
void CommonSubprocessInit() {

‎content/app/content_main_runner_impl.cc

+4-7
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@
9595
#include "sandbox/policy/sandbox_type.h"
9696
#include "sandbox/policy/switches.h"
9797
#include "services/network/public/cpp/features.h"
98-
#include "services/service_manager/embedder/switches.h"
9998
#include "services/tracing/public/cpp/trace_startup.h"
10099
#include "third_party/blink/public/common/origin_trials/trial_token_validator.h"
101100
#include "ui/base/ui_base_paths.h"
@@ -535,7 +534,7 @@ int RunOtherNamedProcessTypeMain(const std::string& process_type,
535534
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
536535
// Zygote startup is special -- see RunZygote comments above
537536
// for why we don't use ZygoteMain directly.
538-
if (process_type == service_manager::switches::kZygoteProcess)
537+
if (process_type == switches::kZygoteProcess)
539538
return RunZygote(delegate);
540539
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
541540

@@ -653,8 +652,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
653652
//
654653
// Startup tracing flags are not (and should not be) passed to Zygote
655654
// processes. We will enable tracing when forked, if needed.
656-
bool enable_startup_tracing =
657-
process_type != service_manager::switches::kZygoteProcess;
655+
bool enable_startup_tracing = process_type != switches::kZygoteProcess;
658656
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
659657
// In the browser process, we have to enable startup tracing after
660658
// InitializeZygoteSandboxForBrowserProcess() is run below, because that
@@ -765,8 +763,7 @@ int ContentMainRunnerImpl::Initialize(const ContentMainParams& params) {
765763
// the call to PreSandboxStartup() on the delegate below), because otherwise
766764
// this would interfere with signal handlers used by crash reporting.
767765
if (should_enable_stack_dump &&
768-
!command_line.HasSwitch(
769-
service_manager::switches::kDisableInProcessStackTraces)) {
766+
!command_line.HasSwitch(switches::kDisableInProcessStackTraces)) {
770767
base::debug::EnableInProcessStackDumping();
771768
}
772769

@@ -826,7 +823,7 @@ int ContentMainRunnerImpl::Run(bool start_service_manager_only) {
826823
command_line.GetSwitchValueASCII(switches::kProcessType);
827824
// Run this logic on all child processes.
828825
if (!process_type.empty()) {
829-
if (process_type != service_manager::switches::kZygoteProcess) {
826+
if (process_type != switches::kZygoteProcess) {
830827
// Zygotes will run this at a later point in time when the command line
831828
// has been updated.
832829
InitializeFieldTrialAndFeatureList();

‎content/browser/browser_child_process_host_impl.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
#include "content/public/common/sandboxed_process_launcher_delegate.h"
5151
#include "mojo/public/cpp/bindings/scoped_message_error_crash_key.h"
5252
#include "mojo/public/cpp/system/platform_handle.h"
53-
#include "services/service_manager/embedder/switches.h"
5453
#include "services/tracing/public/cpp/trace_startup.h"
5554

5655
#if defined(OS_MAC)
@@ -326,7 +325,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCommandLineSwitches(
326325
const base::CommandLine& browser_command_line =
327326
*base::CommandLine::ForCurrentProcess();
328327
static const char* const kForwardSwitches[] = {
329-
service_manager::switches::kDisableInProcessStackTraces,
328+
switches::kDisableInProcessStackTraces,
330329
switches::kDisableBestEffortTasks,
331330
switches::kDisableLogging,
332331
switches::kEnableLogging,

‎content/browser/child_process_launcher_helper_fuchsia.cc

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "content/public/browser/child_process_launcher_utils.h"
1212
#include "content/public/common/sandboxed_process_launcher_delegate.h"
1313
#include "services/service_manager/embedder/result_codes.h"
14-
#include "services/service_manager/embedder/switches.h"
1514

1615
namespace content {
1716
namespace internal {

‎content/browser/child_process_launcher_helper_posix.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "content/public/common/content_descriptors.h"
1818
#include "content/public/common/content_switches.h"
1919
#include "mojo/public/cpp/platform/platform_channel_endpoint.h"
20-
#include "services/service_manager/embedder/switches.h"
2120

2221
namespace content {
2322
namespace internal {
@@ -89,7 +88,7 @@ std::unique_ptr<PosixFileDescriptorInfo> CreateDefaultPosixFilesToMap(
8988
key++;
9089
DCHECK(key < kContentDynamicDescriptorMax);
9190
}
92-
command_line->AppendSwitchASCII(service_manager::switches::kSharedFiles,
91+
command_line->AppendSwitchASCII(switches::kSharedFiles,
9392
file_switch_value_builder.switch_value());
9493

9594
return files_to_register;

‎content/browser/renderer_host/render_process_host_impl.cc

+1-2
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,6 @@
211211
#include "services/network/public/cpp/network_switches.h"
212212
#include "services/network/public/mojom/network_service.mojom.h"
213213
#include "services/resource_coordinator/public/mojom/memory_instrumentation/memory_instrumentation.mojom.h"
214-
#include "services/service_manager/embedder/switches.h"
215214
#include "services/service_manager/public/cpp/binder_registry.h"
216215
#include "services/service_manager/public/cpp/interface_provider.h"
217216
#include "storage/browser/database/database_tracker.h"
@@ -3297,7 +3296,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
32973296
// with any associated values) if present in the browser command line.
32983297
static const char* const kSwitchNames[] = {
32993298
network::switches::kExplicitlyAllowedPorts,
3300-
service_manager::switches::kDisableInProcessStackTraces,
3299+
switches::kDisableInProcessStackTraces,
33013300
sandbox::policy::switches::kDisableSeccompFilterSandbox,
33023301
sandbox::policy::switches::kNoSandbox,
33033302
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_LACROS)

‎content/browser/utility_process_host.cc

-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
#include "sandbox/policy/sandbox_type.h"
3737
#include "sandbox/policy/switches.h"
3838
#include "services/network/public/cpp/network_switches.h"
39-
#include "services/service_manager/embedder/switches.h"
4039
#include "services/service_manager/public/cpp/interface_provider.h"
4140
#include "ui/base/ui_base_switches.h"
4241
#include "ui/gl/gl_switches.h"

0 commit comments

Comments
 (0)