Revert of Turn components/crash into a layered component. (patchset c…

…hromium#6 id:100001 of https://codereview.chromium.org/1315303004/ ) Reason for revert: This breaks Webkit layout tests. Original issue's description: > Turn components/crash into a layered component. > > The crash component cannot be used on iOS (as it depends on //content). > Turn it into a layered component so that it is possible to put shared > code related to crash there (components/crash_keys and objc_zombie.{h,mm}). > > BUG=522955 > TBR=sky@chromium.org > TBR=jschuh@chromium.org > NOPRESUBMIT=true > > Committed: https://crrev.com/4e483c64be5136b785e92c5baa971baca7eea2bc > Cr-Commit-Position: refs/heads/master@{#349384} TBR=blundell@chromium.org,jam@chromium.org,jschuh@chromium.org,mark@chromium.org,rsesek@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=522955 Review URL: https://codereview.chromium.org/1351923002 Cr-Commit-Position: refs/heads/master@{#349417}
marcosholgado · Sep 17, 2015 · d797886 · d797886
1 parent b4be7a2
commit d797886
Show file tree

Hide file tree

Showing 76 changed files with 411 additions and 422 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -571,7 +571,7 @@ group("both_gn_and_gyp") {
       "//chrome/installer/setup:setup_unittests",
       "//chrome_elf:chrome_elf_unittests",
       "//chrome_elf:dll_hash_main",
-      "//components/crash/content/tools:crash_service",
+      "//components/crash/tools:crash_service",
       "//components/wifi:wifi_test",
       "//net:quic_client",
       "//net:quic_server",

diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
@@ -482,7 +482,7 @@ def testFilesToCheckForIncomingDeps(self):
       'chrome/plugin/chrome_content_plugin_client.h',
       'chrome/utility/chrome_content_utility_client.h',
       'chromeos/chromeos_paths.h',
-      'components/crash/content/DEPS',
+      'components/crash/DEPS',
       'components/nacl/common/DEPS',
       'content/public/browser/render_process_host.h',
       'policy/DEPS',

diff --git a/WATCHLISTS b/WATCHLISTS
@@ -142,7 +142,7 @@
                   '|components/bookmarks'
     },
     'breakpad_app': {
-      'filepath': 'components/crash/content/app/',
+      'filepath': 'components/crash/app/',
     },
     'browser': {
       'filepath': 'chrome/browser/',

diff --git a/android_webview/crash_reporter/aw_microdump_crash_reporter.cc b/android_webview/crash_reporter/aw_microdump_crash_reporter.cc
@@ -9,8 +9,8 @@
 #include "base/lazy_instance.h"
 #include "base/scoped_native_library.h"
 #include "build/build_config.h"
-#include "components/crash/content/app/breakpad_linux.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/app/crash_reporter_client.h"
 
 namespace android_webview {
 namespace crash_reporter {

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
@@ -106,7 +106,7 @@ if (!is_android) {
         "//chrome/installer/util",
         "//chrome_elf",
         "//components/browser_watcher:browser_watcher_client",
-        "//components/crash/content/app",
+        "//components/crash/app",
         "//components/crash_keys",
         "//content:startup_helper_win",
         "//crypto",

diff --git a/chrome/app/chrome_crash_reporter_client.h b/chrome/app/chrome_crash_reporter_client.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/crash_reporter_client.h"
 
 namespace browser_watcher {
 class CrashReportingMetrics;

diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
@@ -64,15 +64,15 @@
 #include "chrome/browser/mac/relauncher.h"
 #include "chrome/common/mac/cfbundle_blocker.h"
 #include "chrome/common/mac/objc_zombie.h"
-#include "components/crash/content/app/crashpad_mac.h"
+#include "components/crash/app/crashpad_mac.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #endif
 
 #if defined(OS_POSIX)
 #include <locale.h>
 #include <signal.h>
 #include "chrome/app/chrome_crash_reporter_client.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/crash_reporter_client.h"
 #endif
 
 #if !defined(DISABLE_NACL) && defined(OS_LINUX)
@@ -103,7 +103,7 @@
 #endif
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
-#include "components/crash/content/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
@@ -38,8 +38,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/crash/content/app/breakpad_win.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/breakpad_win.h"
+#include "components/crash/app/crash_reporter_client.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/app/kasko_client.cc b/chrome/app/kasko_client.cc
@@ -17,7 +17,7 @@
 #include "chrome/app/chrome_watcher_client_win.h"
 #include "chrome/chrome_watcher/chrome_watcher_main_api.h"
 #include "chrome/common/chrome_constants.h"
-#include "components/crash/content/app/crash_keys_win.h"
+#include "components/crash/app/crash_keys_win.h"
 #include "syzygy/kasko/api/client.h"
 
 namespace {

diff --git a/chrome/breakpad.isolate b/chrome/breakpad.isolate
@@ -4,7 +4,7 @@
 {
   'variables': {
     'files': [
-      '../components/crash/content/tools/generate_breakpad_symbols.py',
+      '../components/crash/tools/generate_breakpad_symbols.py',
     ],
   },
   'conditions': [

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -585,8 +585,8 @@ source_set("browser") {
       "//chrome/app/chrome_crash_reporter_client.h",
     ]
     deps += [
-      "//components/crash/content/app",
-      "//components/crash/content/browser",
+      "//components/crash/app",
+      "//components/crash/browser",
     ]
   }
   if (use_nss_certs) {

diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc
@@ -15,8 +15,8 @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/crash/content/app/breakpad_linux.h"
-#include "components/crash/content/browser/crash_dump_manager_android.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
 #include "components/enhanced_bookmarks/persistent_image_store.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/android/compositor.h"

diff --git a/chrome/browser/chrome_browser_main_linux.cc b/chrome/browser/chrome_browser_main_linux.cc
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/grit/chromium_strings.h"
-#include "components/crash/content/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
 #include "components/metrics/metrics_service.h"
 #include "media/audio/audio_manager.h"
 #include "ui/base/l10n/l10n_util.h"

diff --git 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/crash/content/app/crashpad_mac.h"
+#include "components/crash/app/crashpad_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
@@ -172,7 +172,7 @@
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 #include "chrome/browser/chrome_browser_main_android.h"
 #include "chrome/common/descriptors_android.h"
-#include "components/crash/content/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
 #include "components/service_tab_launcher/browser/android/service_tab_launcher.h"
 #include "ui/base/resource/resource_bundle_android.h"
 #elif defined(OS_POSIX)
@@ -181,8 +181,8 @@
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 #include "base/debug/leak_annotations.h"
-#include "components/crash/content/app/breakpad_linux.h"
-#include "components/crash/content/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
@@ -75,7 +75,7 @@
 #include "chromeos/settings/cros_settings_provider.h"
 #include "chromeos/settings/timezone_settings.h"
 #include "chromeos/timezone/timezone_provider.h"
-#include "components/crash/content/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
 #include "components/pairing/bluetooth_controller_pairing_controller.h"
 #include "components/pairing/bluetooth_host_pairing_controller.h"
 #include "components/pairing/shark_connection_listener.h"

diff --git a/chrome/browser/crash_upload_list_mac.cc b/chrome/browser/crash_upload_list_mac.cc
@@ -6,7 +6,7 @@
 
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/time/time.h"
-#include "components/crash/content/app/crashpad_mac.h"
+#include "components/crash/app/crashpad_mac.h"
 
 CrashUploadListMac::CrashUploadListMac(
     Delegate* delegate,

diff --git a/chrome/browser/google/google_update_settings_posix.cc b/chrome/browser/google/google_update_settings_posix.cc
@@ -13,7 +13,7 @@
 #include "chrome/common/chrome_paths.h"
 
 #if defined(OS_MACOSX)
-#include "components/crash/content/app/crashpad_mac.h"
+#include "components/crash/app/crashpad_mac.h"
 #endif
 
 namespace {

diff --git 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/crash/content/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
 #include "grit/components_strings.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"

diff --git 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_crash_reporter_client.h"
-#include "components/crash/content/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/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/crash/content/tools/crash_service.h"
+#include "components/crash/tools/crash_service.h"
 
 namespace {
 

diff --git a/chromecast/app/BUILD.gn b/chromecast/app/BUILD.gn
@@ -18,7 +18,7 @@ source_set("app") {
     "//chromecast/browser",
     "//chromecast/common",
     "//chromecast/renderer",
-    "//components/crash/content/app:lib",
+    "//components/crash/app:lib",
     "//content/public/app:both",
     "//content/public/browser",
     "//content/public/common",
@@ -40,8 +40,8 @@ source_set("cast_crash_client") {
     "//base",
     "//chromecast/base",
     "//chromecast/crash",
-    "//components/crash/content/app",
-    "//components/crash/content/app:lib",
+    "//components/crash/app",
+    "//components/crash/app:lib",
     "//content/public/common",
   ]
 }

diff --git a/chromecast/app/android/cast_crash_reporter_client_android.h b/chromecast/app/android/cast_crash_reporter_client_android.h
@@ -6,7 +6,7 @@
 #define CHROMECAST_APP_ANDROID_CAST_CRASH_REPORTER_CLIENT_ANDROID_H_
 
 #include "base/compiler_specific.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/crash_reporter_client.h"
 
 namespace chromecast {
 

diff --git a/chromecast/app/android/crash_handler.cc b/chromecast/app/android/crash_handler.cc
@@ -17,8 +17,8 @@
 #include "breakpad/src/client/linux/handler/minidump_descriptor.h"
 #include "chromecast/app/android/cast_crash_reporter_client_android.h"
 #include "chromecast/base/version.h"
-#include "components/crash/content/app/breakpad_linux.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/app/crash_reporter_client.h"
 #include "content/public/common/content_switches.h"
 #include "jni/CastCrashHandler_jni.h"
 

diff --git a/chromecast/app/cast_main_delegate.cc b/chromecast/app/cast_main_delegate.cc
@@ -22,7 +22,7 @@
 #include "chromecast/common/cast_resource_delegate.h"
 #include "chromecast/common/global_descriptors.h"
 #include "chromecast/renderer/cast_content_renderer_client.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/crash_reporter_client.h"
 #include "content/public/browser/browser_main_runner.h"
 #include "content/public/common/content_switches.h"
 #include "ui/base/resource/resource_bundle.h"

diff --git a/chromecast/app/linux/cast_crash_reporter_client.cc b/chromecast/app/linux/cast_crash_reporter_client.cc
@@ -7,7 +7,7 @@
 #include "base/time/time.h"
 #include "chromecast/base/error_codes.h"
 #include "chromecast/crash/linux/crash_util.h"
-#include "components/crash/content/app/breakpad_linux.h"
+#include "components/crash/app/breakpad_linux.h"
 #include "content/public/common/content_switches.h"
 
 namespace chromecast {

diff --git a/chromecast/app/linux/cast_crash_reporter_client.h b/chromecast/app/linux/cast_crash_reporter_client.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/macros.h"
-#include "components/crash/content/app/crash_reporter_client.h"
+#include "components/crash/app/crash_reporter_client.h"
 
 namespace chromecast {
 

diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn
@@ -74,8 +74,8 @@ source_set("browser") {
     "//chromecast/media",
     "//chromecast/net",
     "//chromecast/service",
-    "//components/crash/content/app",
-    "//components/crash/content/browser",
+    "//components/crash/app",
+    "//components/crash/browser",
     "//components/devtools_http_handler:devtools_http_handler",
     "//components/metrics",
     "//components/metrics:gpu",

diff --git a/chromecast/browser/cast_browser_main_parts.cc b/chromecast/browser/cast_browser_main_parts.cc
@@ -51,7 +51,7 @@
 #if defined(OS_ANDROID)
 #include "chromecast/app/android/crash_handler.h"
 #include "chromecast/browser/media/cast_media_client_android.h"
-#include "components/crash/content/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
 #include "media/base/android/media_client_android.h"
 #include "net/android/network_change_notifier_factory_android.h"
 #else

diff --git a/chromecast/browser/cast_browser_process.cc b/chromecast/browser/cast_browser_process.cc
@@ -15,7 +15,7 @@
 #include "chromecast/service/cast_service.h"
 
 #if defined(OS_ANDROID)
-#include "components/crash/content/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
 #endif  // defined(OS_ANDROID)
 
 #if defined(USE_AURA)

diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
@@ -29,8 +29,8 @@
 #include "chromecast/media/base/media_message_loop.h"
 #include "chromecast/public/cast_media_shlib.h"
 #include "chromecast/public/media/media_pipeline_backend.h"
-#include "components/crash/content/app/breakpad_linux.h"
-#include "components/crash/content/browser/crash_handler_host_linux.h"
+#include "components/crash/app/breakpad_linux.h"
+#include "components/crash/browser/crash_handler_host_linux.h"
 #include "components/network_hints/browser/network_hints_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
@@ -48,7 +48,7 @@
 #include "ui/gl/gl_switches.h"
 
 #if defined(OS_ANDROID)
-#include "components/crash/content/browser/crash_dump_manager_android.h"
+#include "components/crash/browser/crash_dump_manager_android.h"
 #include "components/external_video_surface/browser/android/external_video_surface_container_impl.h"
 #else
 #include "chromecast/browser/media/cast_browser_cdm_factory.h"

diff --git a/components/BUILD.gn b/components/BUILD.gn
@@ -35,8 +35,8 @@ group("all_components") {
     "//components/compression",
     "//components/content_settings/core/browser",
     "//components/content_settings/core/common",
-    "//components/crash/content/app",
-    "//components/crash/content/browser",
+    "//components/crash/app",
+    "//components/crash/browser",
     "//components/crx_file",
     "//components/data_reduction_proxy/core/browser",
     "//components/data_reduction_proxy/core/common",
@@ -189,8 +189,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/crash/content/app",  # Should work, needs checking.
-      "//components/crash/content/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/components.gyp b/components/components.gyp
@@ -21,7 +21,6 @@
     'component_updater.gypi',
     'compression.gypi',
     'content_settings.gypi',
-    'crash.gypi',
     'crash_keys.gypi',
     'cronet.gypi',
     'crx_file.gypi',
@@ -105,6 +104,7 @@
         'browsing_data.gypi',
         'cdm.gypi',
         'certificate_transparency.gypi',
+        'crash.gypi',
         'devtools_discovery.gypi',
         'devtools_http_handler.gypi',
         'drive.gypi',

diff --git a/components/components_tests.gyp b/components/components_tests.gyp
@@ -119,7 +119,7 @@
       'content_settings/core/common/content_settings_pattern_unittest.cc',
     ],
     'crash_unittest_sources': [
-      'crash/content/app/crash_keys_win_unittest.cc',
+      'crash/app/crash_keys_win_unittest.cc',
     ],
     'crx_file_unittest_sources': [
       'crx_file/id_util_unittest.cc',
@@ -236,8 +236,8 @@
       'feedback/feedback_uploader_unittest.cc',
     ],
     'gcm_driver_unittest_sources': [
-      'gcm_driver/gcm_account_mapper_unittest.cc',
       'gcm_driver/gcm_account_tracker_unittest.cc',
+      'gcm_driver/gcm_account_mapper_unittest.cc',
       'gcm_driver/gcm_channel_status_request_unittest.cc',
       'gcm_driver/gcm_client_impl_unittest.cc',
       'gcm_driver/gcm_delayed_task_controller_unittest.cc',