diff options
34 files changed, 149 insertions, 109 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 83fbb9b..e994b16 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -1300,7 +1300,7 @@ 'conditions': [ ['OS=="win"', { 'dependencies': [ - '../content/content.gyp:content_startup_helper_win', + '../content/content.gyp:sandbox_helper_win', ], }], ], diff --git a/ash/shell/content/shell_with_content_main.cc b/ash/shell/content/shell_with_content_main.cc index fad3bdf..59bba97 100644 --- a/ash/shell/content/shell_with_content_main.cc +++ b/ash/shell/content/shell_with_content_main.cc @@ -10,7 +10,7 @@ #include "content/public/app/content_main.h" #if defined(OS_WIN) -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif diff --git a/base/BUILD.gn b/base/BUILD.gn index 6639d6d..0d53aaa 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn @@ -608,6 +608,8 @@ component("base") { "win/metro.h", "win/object_watcher.cc", "win/object_watcher.h", + "win/process_startup_helper.cc", + "win/process_startup_helper.h", "win/registry.cc", "win/registry.h", "win/resource_util.cc", diff --git a/base/base.gypi b/base/base.gypi index fee893e..e6669a1 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -726,6 +726,8 @@ 'win/metro.h', 'win/object_watcher.cc', 'win/object_watcher.h', + 'win/process_startup_helper.cc', + 'win/process_startup_helper.h', 'win/registry.cc', 'win/registry.h', 'win/resource_util.cc', diff --git a/content/app/startup_helper_win.cc b/base/win/process_startup_helper.cc index 187a0f0..7a01211 100644 --- a/content/app/startup_helper_win.cc +++ b/base/win/process_startup_helper.cc @@ -1,17 +1,14 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2015 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/startup_helper_win.h" +#include "base/win/process_startup_helper.h" #include <crtdbg.h> #include <new.h> #include "base/base_switches.h" #include "base/command_line.h" -#include "base/win/windows_version.h" -#include "sandbox/win/src/process_mitigations.h" -#include "sandbox/win/src/sandbox_factory.h" namespace { @@ -33,20 +30,8 @@ void PureCall() { } // namespace -namespace content { - -void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* info) { - info->broker_services = sandbox::SandboxFactory::GetBrokerServices(); - if (!info->broker_services) { - info->target_services = sandbox::SandboxFactory::GetTargetServices(); - } else { - // Ensure the proper mitigations are enforced for the browser process. - sandbox::ApplyProcessMitigationsToCurrentProcess( - sandbox::MITIGATION_DEP | - sandbox::MITIGATION_DEP_NO_ATL_THUNK | - sandbox::MITIGATION_HARDEN_TOKEN_IL_POLICY); - } -} +namespace base { +namespace win { // Register the invalid param handler and pure call handler to be able to // notify breakpad when it happens. @@ -55,7 +40,7 @@ void RegisterInvalidParamHandler() { _set_purecall_handler(PureCall); } -void SetupCRT(const base::CommandLine& command_line) { +void SetupCRT(const CommandLine& command_line) { #if defined(_CRTDBG_MAP_ALLOC) _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR); _CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE); @@ -66,4 +51,5 @@ void SetupCRT(const base::CommandLine& command_line) { #endif } -} // namespace content +} // namespace win +} // namespace base diff --git a/base/win/process_startup_helper.h b/base/win/process_startup_helper.h new file mode 100644 index 0000000..f633dda --- /dev/null +++ b/base/win/process_startup_helper.h @@ -0,0 +1,26 @@ +// Copyright (c) 2015 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. + +#ifndef BASE_WIN_PROCESS_STARTUP_HELPER_H_ +#define BASE_WIN_PROCESS_STARTUP_HELPER_H_ + +#include "base/base_export.h" + +namespace base { + +class CommandLine; + +namespace win { + +// Register the invalid param handler and pure call handler to be able to +// notify breakpad when it happens. +BASE_EXPORT void RegisterInvalidParamHandler(); + +// Sets up the CRT's debugging macros to output to stdout. +BASE_EXPORT void SetupCRT(const CommandLine& command_line); + +} // namespace win +} // namespace base + +#endif // BASE_WIN_PROCESS_STARTUP_HELPER_H_ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index fcbad33..67431e3 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -148,7 +148,7 @@ if (!is_android) { "//components/browser_watcher:browser_watcher_client", "//components/crash/content/app", "//components/crash/core/common", - "//content:startup_helper_win", + "//content:sandbox_helper_win", "//crypto", "//sandbox", "//ui/gfx", diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 2a100bb..9b49e9d 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -42,7 +42,7 @@ #include "components/crash/content/app/breakpad_win.h" #include "components/crash/content/app/crash_reporter_client.h" #include "components/metrics/client_info.h" -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "content/public/common/content_switches.h" #include "sandbox/win/src/sandbox.h" @@ -319,7 +319,7 @@ void ChromeDllLoader::OnBeforeLaunch(const std::string& process_type, g_chrome_crash_client.Get().GetIsPerUserInstall( base::FilePath(exe_path)); if (g_chrome_crash_client.Get().GetShouldDumpLargerDumps( - is_per_user_install)){ + is_per_user_install)) { minidump_type = kasko::api::LARGER_DUMP_TYPE; } } diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index 6865227..89fbe43 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -56,7 +56,7 @@ 'sources': [ # Note that due to InitializeSandboxInfo, this must be directly linked # into chrome.exe, not into a dependent. - '<(DEPTH)/content/app/startup_helper_win.cc', + '<(DEPTH)/content/app/sandbox_helper_win.cc', '<(DEPTH)/content/public/common/content_switches.cc', 'app/chrome_exe_load_config_win.cc', 'app/chrome_exe_main_aura.cc', @@ -531,7 +531,7 @@ 'type': 'executable', 'product_name': 'nacl64', 'sources': [ - '../content/app/startup_helper_win.cc', + '../content/app/sandbox_helper_win.cc', '../content/common/sandbox_init_win.cc', '../content/common/sandbox_win.cc', '../content/public/common/content_switches.cc', diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc index c52e0a8..d59c4d2 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -21,6 +21,7 @@ #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/process/launch.h" +#include "base/process/memory.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -28,6 +29,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "base/version.h" +#include "base/win/process_startup_helper.h" #include "base/win/registry.h" #include "base/win/scoped_com_initializer.h" #include "base/win/scoped_comptr.h" @@ -1758,6 +1760,12 @@ int WINAPI wWinMain(HINSTANCE instance, HINSTANCE prev_instance, scoped_ptr<google_breakpad::ExceptionHandler> breakpad( InitializeCrashReporting(system_install)); + // Make sure the process exits cleanly on unexpected errors. + base::EnableTerminationOnHeapCorruption(); + base::EnableTerminationOnOutOfMemory(); + base::win::RegisterInvalidParamHandler(); + base::win::SetupCRT(cmd_line); + InstallationState original_state; original_state.Initialize(); diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS index 08d6143..19d05a6 100644 --- a/chrome/nacl/DEPS +++ b/chrome/nacl/DEPS @@ -2,7 +2,7 @@ include_rules = [ "+chrome/app/chrome_crash_reporter_client.h", "+components/crash", "+components/nacl", - "+content/public/app/startup_helper_win.h", + "+content/public/app/sandbox_helper_win.h", "+content/public/common/content_switches.h", "+sandbox/win/src", ] diff --git a/components/nacl/broker/DEPS b/components/nacl/broker/DEPS index cd726c6..c7c6baa 100644 --- a/components/nacl/broker/DEPS +++ b/components/nacl/broker/DEPS @@ -1,4 +1,4 @@ include_rules = [ - "+content/public/app/startup_helper_win.h", + "+content/public/app/sandbox_helper_win.h", "+sandbox/win/src", ] diff --git a/components/nacl/loader/DEPS b/components/nacl/loader/DEPS index 751e035..a576f05 100644 --- a/components/nacl/loader/DEPS +++ b/components/nacl/loader/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+components/nacl", - "+content/public/app/startup_helper_win.h", + "+content/public/app/sandbox_helper_win.h", "+content/public/common", "+crypto", "+sandbox/linux/bpf_dsl", diff --git a/components/nacl/loader/nacl_helper_win_64.cc b/components/nacl/loader/nacl_helper_win_64.cc index 91bb8ce..bf9ce7f 100644 --- a/components/nacl/loader/nacl_helper_win_64.cc +++ b/components/nacl/loader/nacl_helper_win_64.cc @@ -2,6 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "components/nacl/loader/nacl_helper_win_64.h" + +#include <string> + #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" @@ -11,11 +15,12 @@ #include "base/process/memory.h" #include "base/strings/string_util.h" #include "base/timer/hi_res_timer_manager.h" +#include "base/win/process_startup_helper.h" #include "components/nacl/broker/nacl_broker_listener.h" #include "components/nacl/common/nacl_switches.h" #include "components/nacl/loader/nacl_listener.h" #include "components/nacl/loader/nacl_main_platform_delegate.h" -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" #include "content/public/common/sandbox_init.h" @@ -57,8 +62,8 @@ int NaClWin64Main() { // Copy what ContentMain() does. base::EnableTerminationOnHeapCorruption(); base::EnableTerminationOnOutOfMemory(); - content::RegisterInvalidParamHandler(); - content::SetupCRT(command_line); + base::win::RegisterInvalidParamHandler(); + base::win::SetupCRT(command_line); // Route stdio to parent console (if any) or create one. if (command_line.HasSwitch(switches::kEnableLogging)) base::RouteStdioToConsole(true); diff --git a/content/BUILD.gn b/content/BUILD.gn index d9c1999..bf85990 100644 --- a/content/BUILD.gn +++ b/content/BUILD.gn @@ -86,16 +86,14 @@ source_set("export") { # In the GYP build, this file is listed in several targets. In GN just have # those targets depend on this one. This can be depended on for any # platform for simplicity, and is a no-op on non-Windows. -source_set("startup_helper_win") { +source_set("sandbox_helper_win") { if (is_win) { sources = [ - "app/startup_helper_win.cc", - "public/app/startup_helper_win.h", + "app/sandbox_helper_win.cc", + "public/app/sandbox_helper_win.h", ] deps = [ - "//base", - "//base:i18n", "//sandbox", ] } diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn index 463d9f1..d8f6791 100644 --- a/content/app/BUILD.gn +++ b/content/app/BUILD.gn @@ -31,7 +31,7 @@ content_app_deps = [ # picking the allocator. "//base/allocator", "//content:export", - "//content:startup_helper_win", + "//content:sandbox_helper_win", "//content/public/common:common_sources", "//content/public/common:mojo_bindings", "//crypto", diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index c2dda31..baa54e9 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -6,6 +6,8 @@ #include <stdlib.h> +#include <string> + #include "base/allocator/allocator_extension.h" #include "base/at_exit.h" #include "base/command_line.h" @@ -36,7 +38,6 @@ #include "content/gpu/in_process_gpu_thread.h" #include "content/public/app/content_main.h" #include "content/public/app/content_main_delegate.h" -#include "content/public/app/startup_helper_win.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" #include "content/public/common/content_constants.h" @@ -75,8 +76,8 @@ #include <malloc.h> #include <cstring> -#include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event_etw_export_win.h" +#include "base/win/process_startup_helper.h" #include "ui/base/win/atl_module.h" #include "ui/gfx/win/dpi.h" #elif defined(OS_MACOSX) @@ -98,7 +99,6 @@ #include "content/public/common/content_descriptors.h" #if !defined(OS_MACOSX) -#include "content/public/common/content_descriptors.h" #include "content/public/common/zygote_fork_delegate_linux.h" #endif #if !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -157,8 +157,8 @@ void SetupSignalHandlers() { // Sanitise our signal handling state. Signals that were ignored by our // parent will also be ignored by us. We also inherit our parent's sigmask. sigset_t empty_signal_set; - CHECK(0 == sigemptyset(&empty_signal_set)); - CHECK(0 == sigprocmask(SIG_SETMASK, &empty_signal_set, NULL)); + CHECK_EQ(0, sigemptyset(&empty_signal_set)); + CHECK_EQ(0, sigprocmask(SIG_SETMASK, &empty_signal_set, NULL)); struct sigaction sigact; memset(&sigact, 0, sizeof(sigact)); @@ -167,11 +167,11 @@ void SetupSignalHandlers() { {SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, SIGFPE, SIGSEGV, SIGALRM, SIGTERM, SIGCHLD, SIGBUS, SIGTRAP}; // SIGPIPE is set below. for (unsigned i = 0; i < arraysize(signals_to_reset); i++) { - CHECK(0 == sigaction(signals_to_reset[i], &sigact, NULL)); + CHECK_EQ(0, sigaction(signals_to_reset[i], &sigact, NULL)); } // Always ignore SIGPIPE. We check the return value of write(). - CHECK(signal(SIGPIPE, SIG_IGN) != SIG_ERR); + CHECK_NE(SIG_ERR, signal(SIGPIPE, SIG_IGN)); } #endif // OS_POSIX && !OS_IOS @@ -443,7 +443,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { base::EnableTerminationOnOutOfMemory(); #if defined(OS_WIN) - RegisterInvalidParamHandler(); + base::win::RegisterInvalidParamHandler(); ui::win::CreateATLModuleIfNeeded(); sandbox_info_ = *params.sandbox_info; @@ -567,7 +567,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { #if !defined(OS_IOS) SetProcessTitleFromCommandLine(argv); #endif -#endif // !OS_ANDROID +#endif // !OS_ANDROID int exit_code = 0; if (delegate_ && delegate_->BasicStartupComplete(&exit_code)) @@ -639,7 +639,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { // Other OSes have to wait till we get here in order for all the memory // management setup to be completed. TRACE_EVENT0("startup,benchmark", "ContentMainRunnerImpl::Initialize"); -#endif // !OS_ANDROID +#endif // !OS_ANDROID #if defined(OS_MACOSX) && !defined(OS_IOS) // We need to allocate the IO Ports before the Sandbox is initialized or @@ -669,7 +669,7 @@ class ContentMainRunnerImpl : public ContentMainRunner { } } #elif defined(OS_WIN) - SetupCRT(command_line); + base::win::SetupCRT(command_line); #endif #if defined(OS_POSIX) diff --git a/content/app/sandbox_helper_win.cc b/content/app/sandbox_helper_win.cc new file mode 100644 index 0000000..6e06e5c4 --- /dev/null +++ b/content/app/sandbox_helper_win.cc @@ -0,0 +1,25 @@ +// Copyright (c) 2011 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/sandbox_helper_win.h" + +#include "sandbox/win/src/process_mitigations.h" +#include "sandbox/win/src/sandbox_factory.h" + +namespace content { + +void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* info) { + info->broker_services = sandbox::SandboxFactory::GetBrokerServices(); + if (!info->broker_services) { + info->target_services = sandbox::SandboxFactory::GetTargetServices(); + } else { + // Ensure the proper mitigations are enforced for the browser process. + sandbox::ApplyProcessMitigationsToCurrentProcess( + sandbox::MITIGATION_DEP | + sandbox::MITIGATION_DEP_NO_ATL_THUNK | + sandbox::MITIGATION_HARDEN_TOKEN_IL_POLICY); + } +} + +} // namespace content diff --git a/content/content.gyp b/content/content.gyp index 48abdf1..bace659 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -31,20 +31,18 @@ ['OS == "win"', { 'targets': [ { - # GN: //content:content_startup_helper_win - 'target_name': 'content_startup_helper_win', + # GN: //content:sandbox_helper_win + 'target_name': 'sandbox_helper_win', 'type': 'static_library', 'include_dirs': [ '..', ], 'dependencies': [ - '../base/base.gyp:base', - '../base/base.gyp:base_i18n', '../sandbox/sandbox.gyp:sandbox', ], 'sources': [ - 'app/startup_helper_win.cc', - 'public/app/startup_helper_win.h', + 'app/sandbox_helper_win.cc', + 'public/app/sandbox_helper_win.h', ], } ], diff --git a/content/content_app.gypi b/content/content_app.gypi index d7b2b44..5afdd33 100644 --- a/content/content_app.gypi +++ b/content/content_app.gypi @@ -59,7 +59,7 @@ }], ['OS=="win"', { 'dependencies': [ - 'content_startup_helper_win', + 'content.gyp:sandbox_helper_win', ], }], ['OS=="ios"', { diff --git a/content/content_tests.gypi b/content/content_tests.gypi index e659f72..81b4e93 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -954,7 +954,7 @@ ['OS == "win"', { 'dependencies': [ '../sandbox/sandbox.gyp:sandbox', - 'content.gyp:content_startup_helper_win', + 'content.gyp:sandbox_helper_win', ], }], ['enable_webrtc==1', { diff --git a/content/public/app/BUILD.gn b/content/public/app/BUILD.gn index d75b59e..aade0ab 100644 --- a/content/public/app/BUILD.gn +++ b/content/public/app/BUILD.gn @@ -28,7 +28,7 @@ public_app_shared_sources = [ "content_main_delegate.cc", "content_main_delegate.h", "content_main_runner.h", - "startup_helper_win.h", + "sandbox_helper_win.h", ] public_app_shared_deps = [ diff --git a/content/public/app/sandbox_helper_win.h b/content/public/app/sandbox_helper_win.h new file mode 100644 index 0000000..6a6454e --- /dev/null +++ b/content/public/app/sandbox_helper_win.h @@ -0,0 +1,22 @@ +// 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. + +#ifndef CONTENT_PUBLIC_APP_SANDBOX_HELPER_WIN_H_ +#define CONTENT_PUBLIC_APP_SANDBOX_HELPER_WIN_H_ + +namespace sandbox { +struct SandboxInterfaceInfo; +} + +namespace content { + +// Initializes the sandbox code and turns on DEP. Note: This function +// must be *statically* linked into the executable (along with the static +// sandbox library); it will not work correctly if it is exported from a +// DLL and linked in. +void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info); + +} // namespace content + +#endif // CONTENT_PUBLIC_APP_SANDBOX_HELPER_WIN_H_ diff --git a/content/public/app/startup_helper_win.h b/content/public/app/startup_helper_win.h deleted file mode 100644 index 6a26b20..0000000 --- a/content/public/app/startup_helper_win.h +++ /dev/null @@ -1,37 +0,0 @@ -// 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. - -#ifndef CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_ -#define CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_ - -namespace base { -class CommandLine; -} - -namespace sandbox { -struct SandboxInterfaceInfo; -} - -// This file contains functions that any embedder that's not using ContentMain -// will want to call at startup. -// NOTE: we never want to CONTENT_EXPORT these functions, they must run in the -// same module that calls them. -namespace content { - -// Initializes the sandbox code and turns on DEP. Note: This function -// must be *statically* linked into the executable (along with the static -// sandbox library); it will not work correctly if it is exported from a -// DLL and linked in. -void InitializeSandboxInfo(sandbox::SandboxInterfaceInfo* sandbox_info); - -// Register the invalid param handler and pure call handler to be able to -// notify breakpad when it happens. -void RegisterInvalidParamHandler(); - -// Sets up the CRT's debugging macros to output to stdout. -void SetupCRT(const base::CommandLine& command_line); - -} // namespace content - -#endif // CONTENT_PUBLIC_APP_STARTUP_HELPER_WIN_H_ diff --git a/content/public/test/test_launcher.cc b/content/public/test/test_launcher.cc index 63532ee..4a28891 100644 --- a/content/public/test/test_launcher.cc +++ b/content/public/test/test_launcher.cc @@ -5,6 +5,7 @@ #include "content/public/test/test_launcher.h" #include <map> +#include <set> #include <string> #include <vector> @@ -28,7 +29,6 @@ #include "base/time/time.h" #include "content/public/app/content_main.h" #include "content/public/app/content_main_delegate.h" -#include "content/public/app/startup_helper_win.h" #include "content/public/common/content_switches.h" #include "content/public/common/sandbox_init.h" #include "content/public/test/browser_test.h" @@ -38,6 +38,7 @@ #if defined(OS_WIN) #include "base/base_switches.h" #include "content/common/sandbox_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_factory.h" #include "sandbox/win/src/sandbox_types.h" #elif defined(OS_MACOSX) diff --git a/content/shell/app/shell_main.cc b/content/shell/app/shell_main.cc index 338570f..a785f5d 100644 --- a/content/shell/app/shell_main.cc +++ b/content/shell/app/shell_main.cc @@ -6,7 +6,7 @@ #include "content/shell/app/shell_main_delegate.h" #if defined(OS_WIN) -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index 6208f6a..48e6163 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -136,7 +136,7 @@ source_set("test_support") { if (is_win) { deps += [ - "//content:startup_helper_win", + "//content:sandbox_helper_win", "//third_party/iaccessible2", ] } @@ -579,7 +579,9 @@ test("content_unittests") { ] } - data_deps = [ "//third_party/mesa:osmesa" ] + data_deps = [ + "//third_party/mesa:osmesa", + ] if (!is_win) { sources += [ "../browser/file_descriptor_info_impl_unittest.cc" ] diff --git a/extensions/shell/app/shell_main.cc b/extensions/shell/app/shell_main.cc index 18a6e63..f3aac10 100644 --- a/extensions/shell/app/shell_main.cc +++ b/extensions/shell/app/shell_main.cc @@ -6,7 +6,7 @@ #include "extensions/shell/app/shell_main_delegate.h" #if defined(OS_WIN) -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif diff --git a/ui/app_list/BUILD.gn b/ui/app_list/BUILD.gn index 1dcb168..7261a6e 100644 --- a/ui/app_list/BUILD.gn +++ b/ui/app_list/BUILD.gn @@ -260,7 +260,7 @@ if (is_linux && !is_chromeos) { deps += [ "//sandbox", - "//content:content_startup_helper_win", + "//content:sandbox_helper_win", ] } } @@ -314,7 +314,9 @@ test("app_list_unittests") { "//ui/resources:ui_test_pak", ] - data_deps = [ "//third_party/mesa:osmesa" ] + data_deps = [ + "//third_party/mesa:osmesa", + ] if (toolkit_views) { sources += [ diff --git a/ui/app_list/app_list.gyp b/ui/app_list/app_list.gyp index 8a0a592..5bbfc77 100644 --- a/ui/app_list/app_list.gyp +++ b/ui/app_list/app_list.gyp @@ -367,7 +367,7 @@ }, 'dependencies': [ '../../sandbox/sandbox.gyp:sandbox', - '../../content/content.gyp:content_startup_helper_win', + '../../content/content.gyp:sandbox_helper_win', ], }], ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { diff --git a/ui/app_list/demo/app_list_demo_views.cc b/ui/app_list/demo/app_list_demo_views.cc index dc71701..c13278d 100644 --- a/ui/app_list/demo/app_list_demo_views.cc +++ b/ui/app_list/demo/app_list_demo_views.cc @@ -17,7 +17,7 @@ #include "ui/views_content_client/views_content_client.h" #if defined(OS_WIN) -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif diff --git a/ui/views/examples/BUILD.gn b/ui/views/examples/BUILD.gn index b25d3f6..03db107 100644 --- a/ui/views/examples/BUILD.gn +++ b/ui/views/examples/BUILD.gn @@ -162,7 +162,7 @@ executable("views_examples_with_content_exe") { "//base", "//build/config/sanitizers:deps", "//content", - "//content:startup_helper_win", + "//content:sandbox_helper_win", "//ui/views_content_client", ] diff --git a/ui/views/examples/examples.gyp b/ui/views/examples/examples.gyp index cdf8120..1c1c3dd 100644 --- a/ui/views/examples/examples.gyp +++ b/ui/views/examples/examples.gyp @@ -190,7 +190,7 @@ }, 'dependencies': [ '../../../sandbox/sandbox.gyp:sandbox', - '../../../content/content.gyp:content_startup_helper_win', + '../../../content/content.gyp:sandbox_helper_win', ], }], ['OS=="win" and component!="shared_library" and win_use_allocator_shim==1', { diff --git a/ui/views/examples/examples_with_content_main_exe.cc b/ui/views/examples/examples_with_content_main_exe.cc index 6d5613e..9dd98f4 100644 --- a/ui/views/examples/examples_with_content_main_exe.cc +++ b/ui/views/examples/examples_with_content_main_exe.cc @@ -8,7 +8,7 @@ #include "ui/views_content_client/views_content_client.h" #if defined(OS_WIN) -#include "content/public/app/startup_helper_win.h" +#include "content/public/app/sandbox_helper_win.h" #include "sandbox/win/src/sandbox_types.h" #endif |