Make sanitizer signal handlers work again.

content/app/content_main_runner.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/app/content_main_runner.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ skipping 39 matching lines @@
 #include "content/public/common/content_constants.h"
 #include "content/public/common/content_descriptor_keys.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
 #include "ipc/ipc_descriptors.h"
 #include "media/base/media.h"
 #include "ppapi/features/features.h"
+#include "services/service_manager/embedder/switches.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(V8_USE_EXTERNAL_STARTUP_DATA) && \
     !defined(CHROME_MULTIPLE_DLL_BROWSER)
 #include "gin/v8_initializer.h"
 #endif
 
 #if defined(OS_WIN)
 #include <malloc.h>
@@ skipping 557 matching lines @@
 #if defined(OS_WIN)
     bool should_enable_stack_dump = !process_type.empty();
 #else
     bool should_enable_stack_dump = true;
 #endif
     // Print stack traces to stderr when crashes occur. This opens up security
     // holes so it should never be enabled for official builds. This needs to
     // happen before crash reporting is initialized (which for chrome happens in
     // the call to PreSandboxStartup() on the delegate below), because otherwise
     // this would interfere with signal handlers used by crash reporting.
-    if (should_enable_stack_dump && !command_line.HasSwitch(
-            switches::kDisableInProcessStackTraces)) {
+    if (should_enable_stack_dump &&
+        !command_line.HasSwitch(
+            service_manager::switches::kDisableInProcessStackTraces)) {
       base::debug::EnableInProcessStackDumping();
     }
 #endif  // !defined(OFFICIAL_BUILD)
 
     if (delegate_)
       delegate_->PreSandboxStartup();
 
 #if defined(OS_WIN)
     CHECK(InitializeSandbox(params.sandbox_info));
 #elif defined(OS_MACOSX)
@@ skipping 110 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContentMainRunnerImpl);
 };
 
 // static
 ContentMainRunner* ContentMainRunner::Create() {
   return new ContentMainRunnerImpl();
 }
 
 }  // namespace content