summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xPRESUBMIT_test.py2
-rw-r--r--WATCHLISTS2
-rw-r--r--chrome/app/DEPS2
-rw-r--r--chrome/app/chrome_breakpad_client.h2
-rw-r--r--chrome/app/chrome_main_delegate.cc6
-rw-r--r--chrome/app/client_util.cc4
-rw-r--r--chrome/browser/BUILD.gn4
-rw-r--r--chrome/browser/DEPS2
-rw-r--r--chrome/browser/chrome_browser_main_android.cc4
-rw-r--r--chrome/browser/chrome_browser_main_linux.cc2
-rw-r--r--chrome/browser/chrome_browser_main_mac.mm2
-rw-r--r--chrome/browser/chrome_content_browser_client.cc8
-rw-r--r--chrome/browser/chromeos/login/wizard_controller.cc2
-rw-r--r--chrome/browser/ui/cocoa/first_run_dialog.mm2
-rw-r--r--chrome/browser/ui/views/first_run_dialog.cc2
-rw-r--r--chrome/chrome_browser.gypi2
-rw-r--r--chrome/chrome_dll.gypi2
-rw-r--r--chrome/chrome_exe.gypi2
-rw-r--r--chrome/chrome_tests_unit.gypi4
-rw-r--r--chrome/nacl/DEPS2
-rw-r--r--chrome/nacl/nacl_exe_win_64.cc2
-rw-r--r--chrome/tools/DEPS2
-rw-r--r--chrome/tools/crash_service/main.cc2
-rw-r--r--components/BUILD.gn8
-rw-r--r--components/OWNERS8
-rw-r--r--components/components.gyp2
-rw-r--r--components/components_tests.gyp9
-rw-r--r--components/crash.gypi (renamed from components/breakpad.gypi)110
-rw-r--r--components/crash/DEPS (renamed from components/breakpad/DEPS)0
-rw-r--r--components/crash/OWNERS (renamed from components/breakpad/OWNERS)0
-rw-r--r--components/crash/app/BUILD.gn (renamed from components/breakpad/app/BUILD.gn)4
-rw-r--r--components/crash/app/DEPS (renamed from components/breakpad/app/DEPS)0
-rw-r--r--components/crash/app/breakpad_client.cc (renamed from components/breakpad/app/breakpad_client.cc)2
-rw-r--r--components/crash/app/breakpad_client.h (renamed from components/breakpad/app/breakpad_client.h)8
-rw-r--r--components/crash/app/breakpad_linux.cc (renamed from components/breakpad/app/breakpad_linux.cc)6
-rw-r--r--components/crash/app/breakpad_linux.h (renamed from components/breakpad/app/breakpad_linux.h)6
-rw-r--r--components/crash/app/breakpad_linux_impl.h (renamed from components/breakpad/app/breakpad_linux_impl.h)8
-rw-r--r--components/crash/app/breakpad_mac.h (renamed from components/breakpad/app/breakpad_mac.h)6
-rw-r--r--components/crash/app/breakpad_mac.mm (renamed from components/breakpad/app/breakpad_mac.mm)4
-rw-r--r--components/crash/app/breakpad_mac_stubs.mm (renamed from components/breakpad/app/breakpad_mac_stubs.mm)2
-rw-r--r--components/crash/app/breakpad_win.cc (renamed from components/breakpad/app/breakpad_win.cc)8
-rw-r--r--components/crash/app/breakpad_win.h (renamed from components/breakpad/app/breakpad_win.h)6
-rw-r--r--components/crash/app/crash_keys_win.cc (renamed from components/breakpad/app/crash_keys_win.cc)4
-rw-r--r--components/crash/app/crash_keys_win.h (renamed from components/breakpad/app/crash_keys_win.h)0
-rw-r--r--components/crash/app/crash_keys_win_unittest.cc (renamed from components/breakpad/app/crash_keys_win_unittest.cc)4
-rw-r--r--components/crash/app/hard_error_handler_win.cc (renamed from components/breakpad/app/hard_error_handler_win.cc)4
-rw-r--r--components/crash/app/hard_error_handler_win.h (renamed from components/breakpad/app/hard_error_handler_win.h)6
-rw-r--r--components/crash/browser/BUILD.gn (renamed from components/breakpad/browser/BUILD.gn)2
-rw-r--r--components/crash/browser/DEPS (renamed from components/breakpad/browser/DEPS)0
-rw-r--r--components/crash/browser/crash_dump_manager_android.cc (renamed from components/breakpad/browser/crash_dump_manager_android.cc)2
-rw-r--r--components/crash/browser/crash_dump_manager_android.h (renamed from components/breakpad/browser/crash_dump_manager_android.h)6
-rw-r--r--components/crash/browser/crash_handler_host_linux.cc (renamed from components/breakpad/browser/crash_handler_host_linux.cc)6
-rw-r--r--components/crash/browser/crash_handler_host_linux.h (renamed from components/breakpad/browser/crash_handler_host_linux.h)6
-rw-r--r--components/crash/tools/BUILD.gn (renamed from components/breakpad/tools/BUILD.gn)0
-rw-r--r--components/crash/tools/crash_service.cc (renamed from components/breakpad/tools/crash_service.cc)2
-rw-r--r--components/crash/tools/crash_service.h (renamed from components/breakpad/tools/crash_service.h)6
-rwxr-xr-xcomponents/crash/tools/dmp2minidump.py (renamed from components/breakpad/tools/dmp2minidump.py)0
-rwxr-xr-xcomponents/crash/tools/generate_breakpad_symbols.py (renamed from components/breakpad/tools/generate_breakpad_symbols.py)0
-rw-r--r--content/content_shell.gypi2
-rw-r--r--content/shell/BUILD.gn4
-rw-r--r--content/shell/DEPS2
-rw-r--r--content/shell/app/shell_breakpad_client.h2
-rw-r--r--content/shell/app/shell_main_delegate.cc6
-rw-r--r--content/shell/browser/shell_browser_main_parts.cc2
-rw-r--r--content/shell/browser/shell_content_browser_client.cc6
-rw-r--r--content/shell/tools/DEPS2
-rw-r--r--content/shell/tools/content_shell_crash_service.cc2
-rw-r--r--remoting/base/breakpad_win.cc2
-rw-r--r--tools/msan/blacklist.txt2
69 files changed, 171 insertions, 170 deletions
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index dd8dcbe..6a18b12 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -440,7 +440,7 @@ class CheckAddedDepsHaveTetsApprovalsTest(unittest.TestCase):
'chrome/plugin/chrome_content_plugin_client.h',
'chrome/utility/chrome_content_utility_client.h',
'chromeos/chromeos_paths.h',
- 'components/breakpad/DEPS',
+ 'components/crash/DEPS',
'components/nacl/common/DEPS',
'content/public/browser/render_process_host.h',
'policy/DEPS',
diff --git a/WATCHLISTS b/WATCHLISTS
index a7dca55..1421529 100644
--- a/WATCHLISTS
+++ b/WATCHLISTS
@@ -139,7 +139,7 @@
'|components/bookmarks'
},
'breakpad_app': {
- 'filepath': 'components/breakpad/app/',
+ 'filepath': 'components/crash/app/',
},
'browser': {
'filepath': 'chrome/browser/',
diff --git a/chrome/app/DEPS b/chrome/app/DEPS
index dcc07692..c88daac 100644
--- a/chrome/app/DEPS
+++ b/chrome/app/DEPS
@@ -8,8 +8,8 @@ include_rules = [
"+chrome_elf/chrome_elf_main.h",
"+chromeos/chromeos_paths.h",
"+chromeos/chromeos_switches.h",
- "+components/breakpad",
"+components/component_updater",
+ "+components/crash",
"+components/metrics/client_info.h",
"+components/nacl/common",
"+components/nacl/zygote",
diff --git a/chrome/app/chrome_breakpad_client.h b/chrome/app/chrome_breakpad_client.h
index 7b750bd..6477699 100644
--- a/chrome/app/chrome_breakpad_client.h
+++ b/chrome/app/chrome_breakpad_client.h
@@ -7,7 +7,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
namespace chrome {
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 050b184..5de4cc5 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -57,7 +57,7 @@
#include "chrome/browser/mac/relauncher.h"
#include "chrome/common/mac/cfbundle_blocker.h"
#include "chrome/common/mac/objc_zombie.h"
-#include "components/breakpad/app/breakpad_mac.h"
+#include "components/crash/app/breakpad_mac.h"
#include "ui/base/l10n/l10n_util_mac.h"
#endif
@@ -65,7 +65,7 @@
#include <locale.h>
#include <signal.h>
#include "chrome/app/chrome_breakpad_client.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
#endif
#if !defined(DISABLE_NACL) && defined(OS_LINUX)
@@ -95,7 +95,7 @@
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
#endif
#if defined(OS_LINUX)
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc
index efb79d5..16d845e 100644
--- a/chrome/app/client_util.cc
+++ b/chrome/app/client_util.cc
@@ -32,8 +32,8 @@
#include "chrome/installer/util/google_update_settings.h"
#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/util_constants.h"
-#include "components/breakpad/app/breakpad_client.h"
-#include "components/breakpad/app/breakpad_win.h"
+#include "components/crash/app/breakpad_client.h"
+#include "components/crash/app/breakpad_win.h"
#include "components/metrics/client_info.h"
#include "content/public/app/startup_helper_win.h"
#include "sandbox/win/src/sandbox.h"
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 15ae840..14ed087 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -389,8 +389,8 @@ static_library("browser") {
"//chrome/app/chrome_breakpad_client.h",
]
deps += [
- "//components/breakpad/app",
- "//components/breakpad/browser",
+ "//components/crash/app",
+ "//components/crash/browser",
]
}
if (use_nss_certs) {
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index 8433194..3670008 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -16,12 +16,12 @@ include_rules = [
"+components/bookmarks/browser",
"+components/bookmarks/common",
"+components/bookmarks/test",
- "+components/breakpad",
"+components/cdm/browser",
"+components/cloud_devices/common",
"+components/component_updater",
"+components/content_settings",
"+components/copresence",
+ "+components/crash",
"+components/crx_file",
"+components/data_reduction_proxy",
"+components/dom_distiller",
diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc
index d7adf4c..fd20dba 100644
--- a/chrome/browser/chrome_browser_main_android.cc
+++ b/chrome/browser/chrome_browser_main_android.cc
@@ -10,8 +10,8 @@
#include "chrome/browser/google/google_search_counter_android.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "components/breakpad/app/breakpad_linux.h"
-#include "components/breakpad/browser/crash_dump_manager_android.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
#include "content/public/browser/android/compositor.h"
#include "content/public/common/main_function_params.h"
#include "net/android/network_change_notifier_factory_android.h"
diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
index 942daad..1ad6b07 100644
--- a/chrome/browser/chrome_browser_main_linux.cc
+++ b/chrome/browser/chrome_browser_main_linux.cc
@@ -7,7 +7,7 @@
#include <fontconfig/fontconfig.h>
#include "chrome/browser/browser_process.h"
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
#include "components/metrics/metrics_service.h"
#if !defined(OS_CHROMEOS)
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index dd7c32f..ec56238 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -24,7 +24,7 @@
#include "chrome/browser/ui/app_list/app_list_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
-#include "components/breakpad/app/breakpad_mac.h"
+#include "components/crash/app/breakpad_mac.h"
#include "components/metrics/metrics_service.h"
#include "content/public/common/main_function_params.h"
#include "content/public/common/result_codes.h"
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 367d7e9..c17c380 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -145,7 +145,7 @@
#elif defined(OS_MACOSX)
#include "chrome/browser/chrome_browser_main_mac.h"
#include "chrome/browser/spellchecker/spellcheck_message_filter_mac.h"
-#include "components/breakpad/app/breakpad_mac.h"
+#include "components/crash/app/breakpad_mac.h"
#elif defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
#include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
@@ -166,15 +166,15 @@
#include "chrome/browser/media/protected_media_identifier_permission_context.h"
#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
#include "chrome/common/descriptors_android.h"
-#include "components/breakpad/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
#elif defined(OS_POSIX)
#include "chrome/browser/chrome_browser_main_posix.h"
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#include "base/debug/leak_annotations.h"
-#include "components/breakpad/app/breakpad_linux.h"
-#include "components/breakpad/browser/crash_handler_host_linux.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/browser/crash_handler_host_linux.h"
#endif
#if defined(OS_ANDROID)
diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc
index 7bfa301..7953d4a 100644
--- a/chrome/browser/chromeos/login/wizard_controller.cc
+++ b/chrome/browser/chromeos/login/wizard_controller.cc
@@ -71,7 +71,7 @@
#include "chromeos/network/portal_detector/network_portal_detector.h"
#include "chromeos/settings/cros_settings_names.h"
#include "chromeos/settings/timezone_settings.h"
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
#include "components/user_manager/user_manager.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_types.h"
diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm
index 6c6df54..13279d3 100644
--- a/chrome/browser/ui/cocoa/first_run_dialog.mm
+++ b/chrome/browser/ui/cocoa/first_run_dialog.mm
@@ -28,7 +28,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/common/pref_names.h"
#include "chrome/installer/util/google_update_settings.h"
-#import "components/breakpad/app/breakpad_mac.h"
+#import "components/crash/app/breakpad_mac.h"
#endif
@interface FirstRunDialogController (PrivateMethods)
diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc
index be41f7b..0dd6950 100644
--- a/chrome/browser/ui/views/first_run_dialog.cc
+++ b/chrome/browser/ui/views/first_run_dialog.cc
@@ -15,7 +15,7 @@
#include "chrome/grit/generated_resources.h"
#include "chrome/grit/locale_settings.h"
#include "chrome/installer/util/google_update_settings.h"
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
#include "grit/theme_resources.h"
#include "ui/aura/env.h"
#include "ui/aura/window.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index f7ab1dd..f4f3848 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3192,8 +3192,8 @@
'app/chrome_breakpad_client.h',
],
'dependencies': [
- '../components/components.gyp:breakpad_component',
'../components/components.gyp:breakpad_host',
+ '../components/components.gyp:crash_component',
],
}],
['use_nss==1', {
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index bc3baf5..c082e88 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -307,7 +307,7 @@
['mac_breakpad_compiled_in==1', {
'dependencies': [
'../breakpad/breakpad.gyp:breakpad',
- '../components/components.gyp:breakpad_component',
+ '../components/components.gyp:crash_component',
'../components/components.gyp:policy',
],
'sources': [
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 64a6dcd..6044979 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -497,7 +497,7 @@
'../breakpad/breakpad.gyp:breakpad_handler',
'../breakpad/breakpad.gyp:breakpad_sender',
'../chrome_elf/chrome_elf.gyp:chrome_elf',
- '../components/components.gyp:breakpad_component',
+ '../components/components.gyp:crash_component',
'../sandbox/sandbox.gyp:sandbox',
],
'sources': [
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 97de56a..a0aeabd 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -396,7 +396,7 @@
['OS=="mac"', {
'dependencies': [
'../breakpad/breakpad.gyp:breakpad',
- '../components/components.gyp:breakpad_component',
+ '../components/components.gyp:crash_component',
],
'sources': [
'app/chrome_breakpad_client.cc',
@@ -2800,7 +2800,7 @@
'dependencies': [
# breakpad is currently only tested on Windows.
'../breakpad/breakpad.gyp:*',
- '../components/components.gyp:breakpad_component',
+ '../components/components.gyp:crash_component',
],
'conditions': [
['win_use_allocator_shim==1', {
diff --git a/chrome/nacl/DEPS b/chrome/nacl/DEPS
index 26f4ce9..7fdf323 100644
--- a/chrome/nacl/DEPS
+++ b/chrome/nacl/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+chrome/app/chrome_breakpad_client.h",
- "+components/breakpad",
+ "+components/crash",
"+components/nacl",
"+content/public/app/startup_helper_win.h",
"+content/public/common/content_switches.h",
diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc
index a0d5351..ec9e538 100644
--- a/chrome/nacl/nacl_exe_win_64.cc
+++ b/chrome/nacl/nacl_exe_win_64.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/lazy_instance.h"
#include "chrome/app/chrome_breakpad_client.h"
-#include "components/breakpad/app/breakpad_win.h"
+#include "components/crash/app/breakpad_win.h"
#include "components/nacl/loader/nacl_helper_win_64.h"
#include "content/public/common/content_switches.h"
diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS
index e149a1e..7f05dd0 100644
--- a/chrome/tools/DEPS
+++ b/chrome/tools/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+chrome/browser",
- "+components/breakpad",
+ "+components/crash",
"+third_party/re2",
]
diff --git a/chrome/tools/crash_service/main.cc b/chrome/tools/crash_service/main.cc
index 0ce5fa8..7194f9e 100644
--- a/chrome/tools/crash_service/main.cc
+++ b/chrome/tools/crash_service/main.cc
@@ -13,7 +13,7 @@
#include "base/path_service.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
-#include "components/breakpad/tools/crash_service.h"
+#include "components/crash/tools/crash_service.h"
namespace {
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 027a230..afb2e63 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -15,14 +15,14 @@ group("all_components") {
"//components/bookmarks/browser",
"//components/bookmarks/common",
"//components/bookmarks/test",
- "//components/breakpad/app",
- "//components/breakpad/browser",
"//components/captive_portal",
"//components/cdm/browser",
"//components/cdm/common",
"//components/cdm/renderer",
"//components/cloud_devices/common",
"//components/component_updater",
+ "//components/crash/app",
+ "//components/crash/browser",
"//components/crx_file",
"//components/data_reduction_proxy/browser",
"//components/data_reduction_proxy/common",
@@ -110,8 +110,8 @@ group("all_components") {
"//components/autofill/content/browser", # Blocked on content/blink.
"//components/autofill/content/common", # Blocked on content.
"//components/autofill/content/renderer", # Blocked on content/blink.
- "//components/breakpad/app", # Should work, needs checking.
- "//components/breakpad/browser", # Should work, needs checking.
+ "//components/crash/app", # Should work, needs checking.
+ "//components/crash/browser", # Should work, needs checking.
"//components/captive_portal", # Should work, needs checking.
"//components/cloud_devices/common", # Should work, needs checking.
"//components/cdm/browser", # Blocked on content.
diff --git a/components/OWNERS b/components/OWNERS
index d186846..8a394c1 100644
--- a/components/OWNERS
+++ b/components/OWNERS
@@ -7,10 +7,6 @@ per-file autofill*=dhollowa@chromium.org
per-file autofill*=isherman@chromium.org
per-file autofill*=kaiwang@chromium.org
-per-file breakpad.gypi=jochen@chromium.org
-per-file breakpad.gypi=rsesek@chromium.org
-per-file breakpad.gypi=thestig@chromium.org
-
per-file bookmarks.gypi=brettw@chromium.org
per-file bookmarks.gypi=sky@chromium.org
@@ -23,6 +19,10 @@ per-file copresence.gypi=ckehoe@chromium.org
per-file copresence.gypi=xiyuan@chromium.org
per-file copresence.gypi=derat@chromium.org
+per-file crash.gypi=jochen@chromium.org
+per-file crash.gypi=rsesek@chromium.org
+per-file crash.gypi=thestig@chromium.org
+
per-file cronet*=mef@chromium.org
per-file cronet*=mmenke@chromium.org
diff --git a/components/components.gyp b/components/components.gyp
index 6d864c3..e19c1a8 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -13,11 +13,11 @@
'auto_login_parser.gypi',
'autofill.gypi',
'bookmarks.gypi',
- 'breakpad.gypi',
'captive_portal.gypi',
'cloud_devices.gypi',
'component_updater.gypi',
'content_settings.gypi',
+ 'crash.gypi',
'cronet.gypi',
'crx_file.gypi',
'data_reduction_proxy.gypi',
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 4a33f06..593ab6c 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -72,7 +72,7 @@
'bookmarks/browser/bookmark_index_unittest.cc',
'bookmarks/browser/bookmark_model_unittest.cc',
'bookmarks/browser/bookmark_utils_unittest.cc',
- 'breakpad/app/crash_keys_win_unittest.cc',
+ 'crash/app/crash_keys_win_unittest.cc',
'captive_portal/captive_portal_detector_unittest.cc',
'cloud_devices/common/cloud_devices_urls_unittest.cc',
'cloud_devices/common/printer_description_unittest.cc',
@@ -274,9 +274,6 @@
'../third_party/libphonenumber/libphonenumber.gyp:libphonenumber',
'../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
- # Dependencies of breakpad
- 'components.gyp:breakpad_test_support',
-
# Dependencies of bookmarks
'components.gyp:bookmarks_browser',
'components.gyp:bookmarks_test_support',
@@ -288,6 +285,9 @@
# Dependencies of cloud_devices
'components.gyp:cloud_devices_common',
+ # Dependencies of crash
+ 'components.gyp:crash_test_support',
+
# Dependencies of crx_file
'components.gyp:crx_file',
@@ -494,6 +494,7 @@
['include', '^auto_login_parser/'],
['include', '^autofill/core/'],
['include', '^bookmarks/'],
+ ['include', '^crash/'],
['include', '^data_reduction_proxy/'],
['include', '^dom_distiller/'],
['include', '^enhanced_bookmarks/'],
diff --git a/components/breakpad.gypi b/components/crash.gypi
index cd13889..5406d95 100644
--- a/components/breakpad.gypi
+++ b/components/crash.gypi
@@ -5,13 +5,13 @@
{
'targets': [
{
- 'target_name': 'breakpad_component_lib',
+ 'target_name': 'crash_component_lib',
'type': 'static_library',
'sources': [
- 'breakpad/app/breakpad_client.cc',
- 'breakpad/app/breakpad_client.h',
- 'breakpad/app/crash_keys_win.cc',
- 'breakpad/app/crash_keys_win.h',
+ 'crash/app/breakpad_client.cc',
+ 'crash/app/breakpad_client.h',
+ 'crash/app/crash_keys_win.cc',
+ 'crash/app/crash_keys_win.h',
],
'include_dirs': [
'..',
@@ -24,9 +24,9 @@
['OS == "ios" ', {
# On IOS there are no files compiled into the library, and we
# can't have libraries with zero objects.
- 'breakpad_component_target_type%': 'none',
+ 'crash_component_target_type%': 'none',
}, {
- 'breakpad_component_target_type%': 'static_library',
+ 'crash_component_target_type%': 'static_library',
}],
],
},
@@ -34,25 +34,25 @@
# content.gyp:content_common, or add
# content/public/common/content_switches.cc to your sources.
#
- # GN version: //components/breakpad/app
- 'target_name': 'breakpad_component',
- 'type': '<(breakpad_component_target_type)',
+ # GN version: //components/crash/app
+ 'target_name': 'crash_component',
+ 'type': '<(crash_component_target_type)',
'sources': [
- 'breakpad/app/breakpad_linux.cc',
- 'breakpad/app/breakpad_linux.h',
- 'breakpad/app/breakpad_linux_impl.h',
- 'breakpad/app/breakpad_mac.h',
- 'breakpad/app/breakpad_mac.mm',
- 'breakpad/app/breakpad_win.cc',
- 'breakpad/app/breakpad_win.h',
- 'breakpad/app/hard_error_handler_win.cc',
- 'breakpad/app/hard_error_handler_win.h',
+ 'crash/app/breakpad_linux.cc',
+ 'crash/app/breakpad_linux.h',
+ 'crash/app/breakpad_linux_impl.h',
+ 'crash/app/breakpad_mac.h',
+ 'crash/app/breakpad_mac.mm',
+ 'crash/app/breakpad_win.cc',
+ 'crash/app/breakpad_win.h',
+ 'crash/app/hard_error_handler_win.cc',
+ 'crash/app/hard_error_handler_win.h',
],
'dependencies': [
- 'breakpad_component_lib',
+ 'crash_component_lib',
'../base/base.gyp:base',
],
- 'defines': ['BREAKPAD_IMPLEMENTATION'],
+ 'defines': ['CRASH_IMPLEMENTATION'],
'conditions': [
['OS=="mac"', {
'dependencies': [
@@ -80,17 +80,17 @@
# the files on Android.
['OS=="android"', {
'sources/': [
- ['include', '^breakpad/app/breakpad_linux\\.cc$'],
+ ['include', '^crash/app/breakpad_linux\\.cc$'],
],
}],
],
},
{
- # GN version: //components/breakpad/app:test_support
- 'target_name': 'breakpad_test_support',
+ # GN version: //components/crash/app:test_support
+ 'target_name': 'crash_test_support',
'type': 'none',
'dependencies': [
- 'breakpad_component_lib',
+ 'crash_component_lib',
],
'direct_dependent_settings': {
'include_dirs' : [
@@ -103,7 +103,7 @@
['OS=="win"', {
'targets': [
{
- # GN version: //components/breakpad/tools:crash_service
+ # GN version: //components/crash/tools:crash_service
'target_name': 'breakpad_crash_service',
'type': 'static_library',
'dependencies': [
@@ -112,8 +112,8 @@
'../breakpad/breakpad.gyp:breakpad_sender',
],
'sources': [
- 'breakpad/tools/crash_service.cc',
- 'breakpad/tools/crash_service.h',
+ 'crash/tools/crash_service.cc',
+ 'crash/tools/crash_service.h',
],
},
],
@@ -127,24 +127,24 @@
'target_name': 'breakpad_win64',
'type': 'static_library',
'sources': [
- 'breakpad/app/breakpad_client.cc',
- 'breakpad/app/breakpad_client.h',
- 'breakpad/app/breakpad_linux.cc',
- 'breakpad/app/breakpad_linux.h',
- 'breakpad/app/breakpad_linux_impl.h',
- 'breakpad/app/breakpad_mac.h',
- 'breakpad/app/breakpad_mac.mm',
- 'breakpad/app/breakpad_win.cc',
- 'breakpad/app/breakpad_win.h',
+ 'crash/app/breakpad_client.cc',
+ 'crash/app/breakpad_client.h',
+ 'crash/app/breakpad_linux.cc',
+ 'crash/app/breakpad_linux.h',
+ 'crash/app/breakpad_linux_impl.h',
+ 'crash/app/breakpad_mac.h',
+ 'crash/app/breakpad_mac.mm',
+ 'crash/app/breakpad_win.cc',
+ 'crash/app/breakpad_win.h',
# TODO(siggi): test the x64 version too.
- 'breakpad/app/crash_keys_win.cc',
- 'breakpad/app/crash_keys_win.h',
- 'breakpad/app/hard_error_handler_win.cc',
- 'breakpad/app/hard_error_handler_win.h',
+ 'crash/app/crash_keys_win.cc',
+ 'crash/app/crash_keys_win.h',
+ 'crash/app/hard_error_handler_win.cc',
+ 'crash/app/hard_error_handler_win.h',
],
'defines': [
'COMPILE_CONTENT_STATICALLY',
- 'BREAKPAD_IMPLEMENTATION',
+ 'CRASH_IMPLEMENTATION',
],
'dependencies': [
'../base/base.gyp:base_win64',
@@ -167,8 +167,8 @@
'../breakpad/breakpad.gyp:breakpad_sender_win64',
],
'sources': [
- 'breakpad/tools/crash_service.cc',
- 'breakpad/tools/crash_service.h',
+ 'crash/tools/crash_service.cc',
+ 'crash/tools/crash_service.h',
],
'configurations': {
'Common_Base': {
@@ -187,10 +187,10 @@
'../base/base.gyp:base',
],
'sources': [
- 'breakpad/app/breakpad_client.cc',
- 'breakpad/app/breakpad_client.h',
- 'breakpad/app/breakpad_mac.h',
- 'breakpad/app/breakpad_mac_stubs.mm',
+ 'crash/app/breakpad_client.cc',
+ 'crash/app/breakpad_client.h',
+ 'crash/app/breakpad_mac.h',
+ 'crash/app/breakpad_mac_stubs.mm',
],
},
],
@@ -198,21 +198,21 @@
['os_posix == 1 and OS != "mac" and OS != "ios" and android_webview_build != 1', {
'targets': [
{
- # GN version: //components/breakpad/browser
+ # GN version: //components/crash/browser
'target_name': 'breakpad_host',
'type': 'static_library',
'dependencies': [
- 'breakpad_component',
+ 'crash_component',
'../base/base.gyp:base',
'../breakpad/breakpad.gyp:breakpad_client',
'../content/content.gyp:content_browser',
'../content/content.gyp:content_common',
],
'sources': [
- 'breakpad/browser/crash_dump_manager_android.cc',
- 'breakpad/browser/crash_dump_manager_android.h',
- 'breakpad/browser/crash_handler_host_linux.cc',
- 'breakpad/browser/crash_handler_host_linux.h',
+ 'crash/browser/crash_dump_manager_android.cc',
+ 'crash/browser/crash_dump_manager_android.h',
+ 'crash/browser/crash_handler_host_linux.cc',
+ 'crash/browser/crash_handler_host_linux.h',
],
'include_dirs': [
'../breakpad/src',
@@ -222,7 +222,7 @@
# the files on Android.
['OS=="android"', {
'sources/': [
- ['include', '^breakpad/browser/crash_handler_host_linux\\.cc$'],
+ ['include', '^crash/browser/crash_handler_host_linux\\.cc$'],
],
}],
],
diff --git a/components/breakpad/DEPS b/components/crash/DEPS
index 9ebc497..9ebc497 100644
--- a/components/breakpad/DEPS
+++ b/components/crash/DEPS
diff --git a/components/breakpad/OWNERS b/components/crash/OWNERS
index e831fb1..e831fb1 100644
--- a/components/breakpad/OWNERS
+++ b/components/crash/OWNERS
diff --git a/components/breakpad/app/BUILD.gn b/components/crash/app/BUILD.gn
index b8bd9aa..5292c1a 100644
--- a/components/breakpad/app/BUILD.gn
+++ b/components/crash/app/BUILD.gn
@@ -23,7 +23,7 @@ source_set("lib") {
# content.gyp:content_common, or add content/public/common/content_switches.cc
# to your sources.
#
-# GYP version: components/breakpad.gyp:breakpad_component
+# GYP version: components/crash.gypi:crash_component
source_set("app") {
sources = [
"breakpad_linux_impl.h",
@@ -43,7 +43,7 @@ source_set("app") {
]
}
- defines = [ "BREAKPAD_IMPLEMENTATION" ]
+ defines = [ "CRASH_IMPLEMENTATION" ]
deps = [
"//base",
diff --git a/components/breakpad/app/DEPS b/components/crash/app/DEPS
index 4080651..4080651 100644
--- a/components/breakpad/app/DEPS
+++ b/components/crash/app/DEPS
diff --git a/components/breakpad/app/breakpad_client.cc b/components/crash/app/breakpad_client.cc
index 5c763ca..965d0e3 100644
--- a/components/breakpad/app/breakpad_client.cc
+++ b/components/crash/app/breakpad_client.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
#include "base/files/file_path.h"
#include "base/logging.h"
diff --git a/components/breakpad/app/breakpad_client.h b/components/crash/app/breakpad_client.h
index 7ade184c..7fe62e2 100644
--- a/components/breakpad/app/breakpad_client.h
+++ b/components/crash/app/breakpad_client.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_APP_BREAKPAD_CLIENT_H_
-#define COMPONENTS_BREAKPAD_APP_BREAKPAD_CLIENT_H_
+#ifndef COMPONENTS_CRASH_APP_BREAKPAD_CLIENT_H_
+#define COMPONENTS_CRASH_APP_BREAKPAD_CLIENT_H_
#include <string>
@@ -33,7 +33,7 @@ class BreakpadClient;
// breakpad code is called, and should stay alive throughout the entire runtime.
void SetBreakpadClient(BreakpadClient* client);
-#if defined(BREAKPAD_IMPLEMENTATION)
+#if defined(CRASH_IMPLEMENTATION)
// Breakpad's embedder API should only be used by breakpad.
BreakpadClient* GetBreakpadClient();
#endif
@@ -140,4 +140,4 @@ class BreakpadClient {
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_APP_BREAKPAD_CLIENT_H_
+#endif // COMPONENTS_CRASH_APP_BREAKPAD_CLIENT_H_
diff --git a/components/breakpad/app/breakpad_linux.cc b/components/crash/app/breakpad_linux.cc
index df9d588..6694fce 100644
--- a/components/breakpad/app/breakpad_linux.cc
+++ b/components/crash/app/breakpad_linux.cc
@@ -5,7 +5,7 @@
// For linux_syscall_support.h. This makes it safe to call embedded system
// calls when in seccomp mode.
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
#include <fcntl.h>
#include <poll.h>
@@ -38,8 +38,8 @@
#include "breakpad/src/client/linux/minidump_writer/directory_reader.h"
#include "breakpad/src/common/linux/linux_libc_support.h"
#include "breakpad/src/common/memory.h"
-#include "components/breakpad/app/breakpad_client.h"
-#include "components/breakpad/app/breakpad_linux_impl.h"
+#include "components/crash/app/breakpad_client.h"
+#include "components/crash/app/breakpad_linux_impl.h"
#include "content/public/common/content_descriptors.h"
#if defined(OS_ANDROID)
diff --git a/components/breakpad/app/breakpad_linux.h b/components/crash/app/breakpad_linux.h
index b507c92..83a3068 100644
--- a/components/breakpad/app/breakpad_linux.h
+++ b/components/crash/app/breakpad_linux.h
@@ -4,8 +4,8 @@
// Public interface for enabling Breakpad on Linux systems.
-#ifndef COMPONENTS_BREAKPAD_APP_BREAKPAD_LINUX_H_
-#define COMPONENTS_BREAKPAD_APP_BREAKPAD_LINUX_H_
+#ifndef COMPONENTS_CRASH_APP_BREAKPAD_LINUX_H_
+#define COMPONENTS_CRASH_APP_BREAKPAD_LINUX_H_
#include <string>
@@ -29,4 +29,4 @@ bool IsCrashReporterEnabled();
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_APP_BREAKPAD_LINUX_H_
+#endif // COMPONENTS_CRASH_APP_BREAKPAD_LINUX_H_
diff --git a/components/breakpad/app/breakpad_linux_impl.h b/components/crash/app/breakpad_linux_impl.h
index f662236..b306e52 100644
--- a/components/breakpad/app/breakpad_linux_impl.h
+++ b/components/crash/app/breakpad_linux_impl.h
@@ -6,14 +6,14 @@
// shared between crash_handler_host_linux.cc and breakpad_linux.cc. It should
// only be used in files compiled with linux_breakpad=1.
-#ifndef COMPONENTS_BREAKPAD_APP_BREAKPAD_LINUX_IMPL_H_
-#define COMPONENTS_BREAKPAD_APP_BREAKPAD_LINUX_IMPL_H_
+#ifndef COMPONENTS_CRASH_APP_BREAKPAD_LINUX_IMPL_H_
+#define COMPONENTS_CRASH_APP_BREAKPAD_LINUX_IMPL_H_
#include <sys/types.h>
#include "base/basictypes.h"
#include "breakpad/src/common/simple_string_dictionary.h"
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
namespace breakpad {
@@ -62,4 +62,4 @@ extern void HandleCrashDump(const BreakpadInfo& info);
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_APP_BREAKPAD_LINUX_IMPL_H_
+#endif // COMPONENTS_CRASH_APP_BREAKPAD_LINUX_IMPL_H_
diff --git a/components/breakpad/app/breakpad_mac.h b/components/crash/app/breakpad_mac.h
index 1db6d75..73f576a 100644
--- a/components/breakpad/app/breakpad_mac.h
+++ b/components/crash/app/breakpad_mac.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_APP_BREAKPAD_MAC_H_
-#define COMPONENTS_BREAKPAD_APP_BREAKPAD_MAC_H_
+#ifndef COMPONENTS_CRASH_APP_BREAKPAD_MAC_H_
+#define COMPONENTS_CRASH_APP_BREAKPAD_MAC_H_
#include <string>
@@ -24,4 +24,4 @@ bool IsCrashReporterEnabled();
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_APP_BREAKPAD_MAC_H_
+#endif // COMPONENTS_CRASH_APP_BREAKPAD_MAC_H_
diff --git a/components/breakpad/app/breakpad_mac.mm b/components/crash/app/breakpad_mac.mm
index 6cb5504..c323c2e 100644
--- a/components/breakpad/app/breakpad_mac.mm
+++ b/components/crash/app/breakpad_mac.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "components/breakpad/app/breakpad_mac.h"
+#import "components/crash/app/breakpad_mac.h"
#include <CoreFoundation/CoreFoundation.h>
#import <Foundation/Foundation.h>
@@ -24,7 +24,7 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_restrictions.h"
#import "breakpad/src/client/mac/Framework/Breakpad.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
namespace breakpad {
diff --git a/components/breakpad/app/breakpad_mac_stubs.mm b/components/crash/app/breakpad_mac_stubs.mm
index a05e150..e2b325c 100644
--- a/components/breakpad/app/breakpad_mac_stubs.mm
+++ b/components/crash/app/breakpad_mac_stubs.mm
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#import "components/breakpad/app/breakpad_mac.h"
+#import "components/crash/app/breakpad_mac.h"
#import <Foundation/Foundation.h>
diff --git a/components/breakpad/app/breakpad_win.cc b/components/crash/app/breakpad_win.cc
index 5fdf9c2..8285c7c 100644
--- a/components/breakpad/app/breakpad_win.cc
+++ b/components/crash/app/breakpad_win.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/app/breakpad_win.h"
+#include "components/crash/app/breakpad_win.h"
#include <windows.h>
#include <shellapi.h>
@@ -32,9 +32,9 @@
#include "base/win/registry.h"
#include "base/win/win_util.h"
#include "breakpad/src/client/windows/handler/exception_handler.h"
-#include "components/breakpad/app/breakpad_client.h"
-#include "components/breakpad/app/crash_keys_win.h"
-#include "components/breakpad/app/hard_error_handler_win.h"
+#include "components/crash/app/breakpad_client.h"
+#include "components/crash/app/crash_keys_win.h"
+#include "components/crash/app/hard_error_handler_win.h"
#include "content/public/common/result_codes.h"
#include "sandbox/win/src/nt_internals.h"
#include "sandbox/win/src/sidestep/preamble_patcher.h"
diff --git a/components/breakpad/app/breakpad_win.h b/components/crash/app/breakpad_win.h
index 926192d..3e51a8e 100644
--- a/components/breakpad/app/breakpad_win.h
+++ b/components/crash/app/breakpad_win.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_APP_BREAKPAD_WIN_H_
-#define COMPONENTS_BREAKPAD_APP_BREAKPAD_WIN_H_
+#ifndef COMPONENTS_CRASH_APP_BREAKPAD_WIN_H_
+#define COMPONENTS_CRASH_APP_BREAKPAD_WIN_H_
#include <windows.h>
#include <string>
@@ -19,4 +19,4 @@ bool ShowRestartDialogIfCrashed(bool* exit_now);
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_APP_BREAKPAD_WIN_H_
+#endif // COMPONENTS_CRASH_APP_BREAKPAD_WIN_H_
diff --git a/components/breakpad/app/crash_keys_win.cc b/components/crash/app/crash_keys_win.cc
index 68bbd389d..064b63e 100644
--- a/components/breakpad/app/crash_keys_win.cc
+++ b/components/crash/app/crash_keys_win.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/app/crash_keys_win.h"
+#include "components/crash/app/crash_keys_win.h"
#include <algorithm>
@@ -12,7 +12,7 @@
#include "base/logging.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
namespace breakpad {
diff --git a/components/breakpad/app/crash_keys_win.h b/components/crash/app/crash_keys_win.h
index 135a31c..135a31c 100644
--- a/components/breakpad/app/crash_keys_win.h
+++ b/components/crash/app/crash_keys_win.h
diff --git a/components/breakpad/app/crash_keys_win_unittest.cc b/components/crash/app/crash_keys_win_unittest.cc
index 6574e50..7dfec8d 100644
--- a/components/breakpad/app/crash_keys_win_unittest.cc
+++ b/components/crash/app/crash_keys_win_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/app/crash_keys_win.h"
+#include "components/crash/app/crash_keys_win.h"
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/strings/stringprintf.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/breakpad/app/hard_error_handler_win.cc b/components/crash/app/hard_error_handler_win.cc
index cf93adc..0bd6591 100644
--- a/components/breakpad/app/hard_error_handler_win.cc
+++ b/components/crash/app/hard_error_handler_win.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/app/hard_error_handler_win.h"
+#include "components/crash/app/hard_error_handler_win.h"
#if defined(_WIN32_WINNT_WIN8) && _MSC_VER < 1700
// The Windows 8 SDK defines FACILITY_VISUALCPP in winerror.h, and in
@@ -14,7 +14,7 @@
#include "base/basictypes.h"
#include "base/strings/string_util.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
namespace breakpad {
diff --git a/components/breakpad/app/hard_error_handler_win.h b/components/crash/app/hard_error_handler_win.h
index daf0482..7855616 100644
--- a/components/breakpad/app/hard_error_handler_win.h
+++ b/components/crash/app/hard_error_handler_win.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_APP_HARD_ERROR_HANDLER_WIN_H_
-#define COMPONENTS_BREAKPAD_APP_HARD_ERROR_HANDLER_WIN_H_
+#ifndef COMPONENTS_CRASH_APP_HARD_ERROR_HANDLER_WIN_H_
+#define COMPONENTS_CRASH_APP_HARD_ERROR_HANDLER_WIN_H_
#include <windows.h>
@@ -31,4 +31,4 @@ bool HardErrorHandler(EXCEPTION_POINTERS* ex_info);
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_APP_HARD_ERROR_HANDLER_WIN_H_
+#endif // COMPONENTS_CRASH_APP_HARD_ERROR_HANDLER_WIN_H_
diff --git a/components/breakpad/browser/BUILD.gn b/components/crash/browser/BUILD.gn
index 89ec7b7..19a527e 100644
--- a/components/breakpad/browser/BUILD.gn
+++ b/components/crash/browser/BUILD.gn
@@ -19,7 +19,7 @@ source_set("browser") {
deps = [
"//base",
- "//components/breakpad/app",
+ "//components/crash/app",
"//content/public/browser",
"//content/public/common",
]
diff --git a/components/breakpad/browser/DEPS b/components/crash/browser/DEPS
index c24130e..c24130e 100644
--- a/components/breakpad/browser/DEPS
+++ b/components/crash/browser/DEPS
diff --git a/components/breakpad/browser/crash_dump_manager_android.cc b/components/crash/browser/crash_dump_manager_android.cc
index a8f4c38..d208e9c 100644
--- a/components/breakpad/browser/crash_dump_manager_android.cc
+++ b/components/crash/browser/crash_dump_manager_android.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
#include "base/bind.h"
#include "base/file_util.h"
diff --git a/components/breakpad/browser/crash_dump_manager_android.h b/components/crash/browser/crash_dump_manager_android.h
index fdb57d7..2abf061 100644
--- a/components/breakpad/browser/crash_dump_manager_android.h
+++ b/components/crash/browser/crash_dump_manager_android.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_BROWSER_CRASH_DUMP_MANAGER_ANDROID_H_
-#define COMPONENTS_BREAKPAD_BROWSER_CRASH_DUMP_MANAGER_ANDROID_H_
+#ifndef COMPONENTS_CRASH_BROWSER_CRASH_DUMP_MANAGER_ANDROID_H_
+#define COMPONENTS_CRASH_BROWSER_CRASH_DUMP_MANAGER_ANDROID_H_
#include <map>
@@ -81,4 +81,4 @@ class CrashDumpManager : public content::BrowserChildProcessObserver,
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_BROWSER_CRASH_DUMP_MANAGER_ANDROID_H_
+#endif // COMPONENTS_CRASH_BROWSER_CRASH_DUMP_MANAGER_ANDROID_H_
diff --git a/components/breakpad/browser/crash_handler_host_linux.cc b/components/crash/browser/crash_handler_host_linux.cc
index 543ebc4..1e2890c 100644
--- a/components/breakpad/browser/crash_handler_host_linux.cc
+++ b/components/crash/browser/crash_handler_host_linux.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/browser/crash_handler_host_linux.h"
+#include "components/crash/browser/crash_handler_host_linux.h"
#include <stdint.h>
#include <stdlib.h>
@@ -28,7 +28,7 @@
#include "breakpad/src/client/linux/handler/exception_handler.h"
#include "breakpad/src/client/linux/minidump_writer/linux_dumper.h"
#include "breakpad/src/client/linux/minidump_writer/minidump_writer.h"
-#include "components/breakpad/app/breakpad_linux_impl.h"
+#include "components/crash/app/breakpad_linux_impl.h"
#include "content/public/browser/browser_thread.h"
#if defined(OS_ANDROID) && !defined(__LP64__)
@@ -141,7 +141,7 @@ void CrashHandlerHostLinux::OnFileCanReadWithoutBlocking(int fd) {
// for writing the minidump as well as a file descriptor and a credentials
// block so that they can't lie about their pid.
//
- // The message sender is in components/breakpad/app/breakpad_linux.cc.
+ // The message sender is in components/crash/app/breakpad_linux.cc.
struct msghdr msg = {0};
struct iovec iov[kCrashIovSize];
diff --git a/components/breakpad/browser/crash_handler_host_linux.h b/components/crash/browser/crash_handler_host_linux.h
index 958831d..9c6b603 100644
--- a/components/breakpad/browser/crash_handler_host_linux.h
+++ b/components/crash/browser/crash_handler_host_linux.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
-#define COMPONENTS_BREAKPAD_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
+#ifndef COMPONENTS_CRASH_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
+#define COMPONENTS_CRASH_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
#include <sys/types.h>
@@ -90,4 +90,4 @@ class CrashHandlerHostLinux : public base::MessageLoopForIO::Watcher,
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
+#endif // COMPONENTS_CRASH_BROWSER_CRASH_HANDLER_HOST_LINUX_H_
diff --git a/components/breakpad/tools/BUILD.gn b/components/crash/tools/BUILD.gn
index 665398e..665398e 100644
--- a/components/breakpad/tools/BUILD.gn
+++ b/components/crash/tools/BUILD.gn
diff --git a/components/breakpad/tools/crash_service.cc b/components/crash/tools/crash_service.cc
index 425337f..fd1fc02 100644
--- a/components/breakpad/tools/crash_service.cc
+++ b/components/crash/tools/crash_service.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "components/breakpad/tools/crash_service.h"
+#include "components/crash/tools/crash_service.h"
#include <windows.h>
diff --git a/components/breakpad/tools/crash_service.h b/components/crash/tools/crash_service.h
index 4f54b5e..81b28bd 100644
--- a/components/breakpad/tools/crash_service.h
+++ b/components/crash/tools/crash_service.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef COMPONENTS_BREAKPAD_TOOLS_CRASH_SERVICE_H_
-#define COMPONENTS_BREAKPAD_TOOLS_CRASH_SERVICE_H_
+#ifndef COMPONENTS_CRASH_TOOLS_CRASH_SERVICE_H_
+#define COMPONENTS_CRASH_TOOLS_CRASH_SERVICE_H_
#include <string>
@@ -122,4 +122,4 @@ class CrashService {
} // namespace breakpad
-#endif // COMPONENTS_BREAKPAD_TOOLS_CRASH_SERVICE_H_
+#endif // COMPONENTS_CRASH_TOOLS_CRASH_SERVICE_H_
diff --git a/components/breakpad/tools/dmp2minidump.py b/components/crash/tools/dmp2minidump.py
index 7823d48..7823d48 100755
--- a/components/breakpad/tools/dmp2minidump.py
+++ b/components/crash/tools/dmp2minidump.py
diff --git a/components/breakpad/tools/generate_breakpad_symbols.py b/components/crash/tools/generate_breakpad_symbols.py
index 003399e..003399e 100755
--- a/components/breakpad/tools/generate_breakpad_symbols.py
+++ b/components/crash/tools/generate_breakpad_symbols.py
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index 76229ca6..119f635 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -46,7 +46,7 @@
'../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
'../cc/blink/cc_blink.gyp:cc_blink',
'../cc/cc.gyp:cc',
- '../components/components.gyp:breakpad_component',
+ '../components/components.gyp:crash_component',
'../gin/gin.gyp:gin',
'../gpu/gpu.gyp:gpu',
'../ipc/ipc.gyp:ipc',
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index b464832..bfff38e 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -207,7 +207,7 @@ static_library("content_shell_lib") {
"//base/allocator",
"//base/third_party/dynamic_annotations",
"//cc",
- "//components/breakpad/app",
+ "//components/crash/app",
"//content:resources",
"//content/app:both",
"//content/app/resources",
@@ -266,7 +266,7 @@ static_library("content_shell_lib") {
}
if (is_posix && !is_mac && (!is_android || !is_android_webview_build)) {
- deps += [ "//components/breakpad/browser" ]
+ deps += [ "//components/crash/browser" ]
}
if (use_aura) {
diff --git a/content/shell/DEPS b/content/shell/DEPS
index d3108b8..bd60cf5 100644
--- a/content/shell/DEPS
+++ b/content/shell/DEPS
@@ -20,7 +20,7 @@ include_rules = [
"+ui/aura",
"+ui/views",
- "+components/breakpad",
+ "+components/crash",
]
specific_include_rules = {
diff --git a/content/shell/app/shell_breakpad_client.h b/content/shell/app/shell_breakpad_client.h
index 5f06cce..caed544 100644
--- a/content/shell/app/shell_breakpad_client.h
+++ b/content/shell/app/shell_breakpad_client.h
@@ -6,7 +6,7 @@
#define CONTENT_SHELL_APP_SHELL_BREAKPAD_CLIENT_H_
#include "base/compiler_specific.h"
-#include "components/breakpad/app/breakpad_client.h"
+#include "components/crash/app/breakpad_client.h"
namespace content {
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 05c8c04..b0eea5d 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -48,7 +48,7 @@
#if defined(OS_MACOSX)
#include "base/mac/os_crash_dumps.h"
-#include "components/breakpad/app/breakpad_mac.h"
+#include "components/crash/app/breakpad_mac.h"
#include "content/shell/app/paths_mac.h"
#include "content/shell/app/shell_main_delegate_mac.h"
#endif // OS_MACOSX
@@ -57,11 +57,11 @@
#include <initguid.h>
#include <windows.h>
#include "base/logging_win.h"
-#include "components/breakpad/app/breakpad_win.h"
+#include "components/crash/app/breakpad_win.h"
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "components/breakpad/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
#endif
namespace {
diff --git a/content/shell/browser/shell_browser_main_parts.cc b/content/shell/browser/shell_browser_main_parts.cc
index 0c33076..404f140 100644
--- a/content/shell/browser/shell_browser_main_parts.cc
+++ b/content/shell/browser/shell_browser_main_parts.cc
@@ -34,7 +34,7 @@
#endif
#if defined(OS_ANDROID)
-#include "components/breakpad/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
#include "net/android/network_change_notifier_factory_android.h"
#include "net/base/network_change_notifier.h"
#endif
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index b2f85d2..6a58fa9 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -38,14 +38,14 @@
#if defined(OS_ANDROID)
#include "base/android/path_utils.h"
#include "base/path_service.h"
-#include "components/breakpad/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
#include "content/shell/android/shell_descriptors.h"
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX)
#include "base/debug/leak_annotations.h"
-#include "components/breakpad/app/breakpad_linux.h"
-#include "components/breakpad/browser/crash_handler_host_linux.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/browser/crash_handler_host_linux.h"
#include "content/public/common/content_descriptors.h"
#endif
diff --git a/content/shell/tools/DEPS b/content/shell/tools/DEPS
index 7083ae7..387561a 100644
--- a/content/shell/tools/DEPS
+++ b/content/shell/tools/DEPS
@@ -1,4 +1,4 @@
include_rules = [
"+content/public",
- "+components/breakpad",
+ "+components/crash",
]
diff --git a/content/shell/tools/content_shell_crash_service.cc b/content/shell/tools/content_shell_crash_service.cc
index 3b82d1b..66e5433 100644
--- a/content/shell/tools/content_shell_crash_service.cc
+++ b/content/shell/tools/content_shell_crash_service.cc
@@ -10,7 +10,7 @@
#include "base/command_line.h"
#include "base/files/file_path.h"
#include "base/logging.h"
-#include "components/breakpad/tools/crash_service.h"
+#include "components/crash/tools/crash_service.h"
int __stdcall wWinMain(HINSTANCE instance, HINSTANCE, wchar_t* cmd_line,
int show_mode) {
diff --git a/remoting/base/breakpad_win.cc b/remoting/base/breakpad_win.cc
index a19a717..ce39d91 100644
--- a/remoting/base/breakpad_win.cc
+++ b/remoting/base/breakpad_win.cc
@@ -4,7 +4,7 @@
// This module contains the necessary code to register the Breakpad exception
// handler. This implementation is based on Chrome crash reporting code. See:
-// - src/components/breakpad/app/breakpad_win.cc
+// - src/components/crash/app/breakpad_win.cc
// - src/chrome/installer/setup/setup_main.cc
#include "remoting/base/breakpad.h"
diff --git a/tools/msan/blacklist.txt b/tools/msan/blacklist.txt
index 56308ff..53679177 100644
--- a/tools/msan/blacklist.txt
+++ b/tools/msan/blacklist.txt
@@ -27,7 +27,7 @@ fun:*UTF8GenericReplaceInternal*
# False positives due to use of linux_syscall_support. http://crbug.com/394028
src:*/breakpad/src/*
-src:*/components/breakpad/app/breakpad_linux.cc
+src:*/components/crash/app/breakpad_linux.cc
# Bug in MSan, fixed in clang r211022. http://crbug.com/385074
fun:*TEST_SeccompRetTrace*
generated by cgit v1.1 at 2024-05-21 11:52:00 +0000