From d0f837d64102812529ed5c90c2d761791e90b522 Mon Sep 17 00:00:00 2001 From: "jochen@chromium.org" Date: Sat, 29 Jun 2013 23:29:54 +0000 Subject: [PATCH] Revert r206949 - "Start moving breakpad integration to a component." I'll use a different approach to move breakpad to a component. > Step 1: move the DIR_CRASH_DUMPS symbol to the component > > BUG=247431 > > Review URL: https://chromiumcodereview.appspot.com/16924012 TBR=thestig@chromium.org Review URL: https://chromiumcodereview.appspot.com/18277002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209356 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/app/DEPS | 1 - chrome/app/breakpad_linux.cc | 6 +-- chrome/app/breakpad_mac.mm | 6 +-- chrome/browser/DEPS | 1 - chrome/browser/android/crash_dump_manager.cc | 4 +- .../automation/testing_automation_provider.cc | 4 +- chrome/browser/crash_handler_host_linux.cc | 4 +- chrome/browser/crash_upload_list.cc | 4 +- chrome/chrome_common.gypi | 1 - chrome/common/DEPS | 1 - chrome/common/chrome_paths.cc | 40 +++++++++---------- chrome/common/chrome_paths.h | 1 + chrome/test/reliability/automated_ui_tests.cc | 4 +- chrome/test/reliability/page_load_test.cc | 3 +- chrome/test/ui/ui_test.cc | 3 +- chrome/tools/DEPS | 1 - chrome/tools/crash_service/crash_service.cc | 3 +- .../test/reliability/page_load_test.cc | 3 +- components/OWNERS | 4 -- components/breakpad.gypi | 19 --------- components/breakpad/OWNERS | 3 -- components/breakpad/common/breakpad_paths.h | 22 ---------- components/components.gyp | 1 - 23 files changed, 39 insertions(+), 100 deletions(-) delete mode 100644 components/breakpad.gypi delete mode 100644 components/breakpad/OWNERS delete mode 100644 components/breakpad/common/breakpad_paths.h diff --git a/chrome/app/DEPS b/chrome/app/DEPS index 77f6a4bac6ad6b..f8154fa3bdf623 100644 --- a/chrome/app/DEPS +++ b/chrome/app/DEPS @@ -7,7 +7,6 @@ include_rules = [ "+chrome/renderer/chrome_content_renderer_client.h", "+chrome/utility/chrome_content_utility_client.h", "+chromeos/chromeos_paths.h", - "+components/breakpad/common/breakpad_paths.h", "+components/nacl/common", "+content/public/app", "+content/public/browser/browser_main_runner.h", diff --git a/chrome/app/breakpad_linux.cc b/chrome/app/breakpad_linux.cc index 938d5a29b3a6c0..bd6018d2ebdb89 100644 --- a/chrome/app/breakpad_linux.cc +++ b/chrome/app/breakpad_linux.cc @@ -39,13 +39,13 @@ #include "chrome/app/breakpad_linux_impl.h" #include "chrome/browser/crash_upload_list.h" #include "chrome/common/child_process_logging.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info_posix.h" #include "chrome/common/crash_keys.h" #include "chrome/common/dump_without_crashing.h" #include "chrome/common/env_vars.h" #include "chrome/common/logging_chrome.h" -#include "components/breakpad/common/breakpad_paths.h" #include "content/public/common/content_descriptors.h" #if defined(OS_ANDROID) @@ -533,7 +533,7 @@ void EnableCrashDumping(bool unattended) { PathService::Get(base::DIR_TEMP, &tmp_path); base::FilePath dumps_path(tmp_path); - if (PathService::Get(breakpad::DIR_CRASH_DUMPS, &dumps_path)) { + if (PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path)) { base::FilePath logfile = dumps_path.AppendASCII(CrashUploadList::kReporterLogFilename); std::string logfile_str = logfile.value(); @@ -1465,7 +1465,7 @@ void InitCrashReporter() { base::FilePath alternate_minidump_location_path( alternate_minidump_location); PathService::Override( - breakpad::DIR_CRASH_DUMPS, + chrome::DIR_CRASH_DUMPS, base::FilePath(alternate_minidump_location)); } diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index b08a0a3eef0a1a..0793bfe763a556 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -25,13 +25,13 @@ #include "base/threading/thread_restrictions.h" #import "breakpad/src/client/mac/Framework/Breakpad.h" #include "chrome/common/child_process_logging.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/crash_keys.h" #include "chrome/common/dump_without_crashing.h" #include "chrome/common/env_vars.h" #include "chrome/common/logging_chrome.h" #include "chrome/installer/util/google_update_settings.h" -#include "components/breakpad/common/breakpad_paths.h" #include "components/nacl/common/nacl_switches.h" #include "native_client/src/trusted/service_runtime/osx/crash_filter.h" #include "policy/policy_constants.h" @@ -250,7 +250,7 @@ void InitCrashReporter() { " doesn't exist"; } else { PathService::Override( - breakpad::DIR_CRASH_DUMPS, + chrome::DIR_CRASH_DUMPS, base::FilePath(alternate_minidump_location)); if (is_browser) { // Print out confirmation message to the stdout, but only print @@ -262,7 +262,7 @@ void InitCrashReporter() { } base::FilePath dir_crash_dumps; - PathService::Get(breakpad::DIR_CRASH_DUMPS, &dir_crash_dumps); + PathService::Get(chrome::DIR_CRASH_DUMPS, &dir_crash_dumps); [breakpad_config setObject:base::SysUTF8ToNSString(dir_crash_dumps.value()) forKey:@BREAKPAD_DUMP_DIRECTORY]; diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index e5d45e3ce41ef6..632d192e21d19d 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -9,7 +9,6 @@ include_rules = [ "+components/autofill/core/browser", "+components/autofill/core/common", "+components/auto_login_parser", - "+components/breakpad", "+components/browser_context_keyed_service", "+components/nacl/common", "+components/navigation_interception", diff --git a/chrome/browser/android/crash_dump_manager.cc b/chrome/browser/android/crash_dump_manager.cc index 07e08816385a04..a7c2c198d189b6 100644 --- a/chrome/browser/android/crash_dump_manager.cc +++ b/chrome/browser/android/crash_dump_manager.cc @@ -14,8 +14,8 @@ #include "base/rand_util.h" #include "base/stl_util.h" #include "base/strings/stringprintf.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/descriptors_android.h" -#include "components/breakpad/common/breakpad_paths.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/file_descriptor_info.h" @@ -100,7 +100,7 @@ void CrashDumpManager::ProcessMinidump(const base::FilePath& minidump_path, // We are dealing with a valid minidump. Copy it to the crash report // directory from where Java code will upload it later on. base::FilePath crash_dump_dir; - r = PathService::Get(breakpad::DIR_CRASH_DUMPS, &crash_dump_dir); + r = PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_dir); if (!r) { NOTREACHED() << "Failed to retrieve the crash dump directory."; return; diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index 9ccef4bfdba9ce..0166c91da0e3cf 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -112,6 +112,7 @@ #include "chrome/common/automation_messages.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_notification_types.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/background_info.h" #include "chrome/common/extensions/extension.h" @@ -120,7 +121,6 @@ #include "chrome/common/extensions/permissions/permissions_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" -#include "components/breakpad/common/breakpad_paths.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/child_process_data.h" #include "content/public/browser/favicon_status.h" @@ -2238,7 +2238,7 @@ void TestingAutomationProvider::GetBrowserInfo( properties->SetString("command_line_string", CommandLine::ForCurrentProcess()->GetCommandLineString()); base::FilePath dumps_path; - PathService::Get(breakpad::DIR_CRASH_DUMPS, &dumps_path); + PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path); properties->SetString("DIR_CRASH_DUMPS", dumps_path.value()); #if defined(USE_AURA) properties->SetBoolean("aura", true); diff --git a/chrome/browser/crash_handler_host_linux.cc b/chrome/browser/crash_handler_host_linux.cc index 51e1a3cda11dee..b25696fc042322 100644 --- a/chrome/browser/crash_handler_host_linux.cc +++ b/chrome/browser/crash_handler_host_linux.cc @@ -28,8 +28,8 @@ #include "breakpad/src/client/linux/minidump_writer/linux_dumper.h" #include "breakpad/src/client/linux/minidump_writer/minidump_writer.h" #include "chrome/app/breakpad_linux_impl.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/env_vars.h" -#include "components/breakpad/common/breakpad_paths.h" #include "content/public/browser/browser_thread.h" #if defined(OS_ANDROID) @@ -379,7 +379,7 @@ void CrashHandlerHostLinux::WriteDumpFile(BreakpadInfo* info, base::FilePath dumps_path("/tmp"); PathService::Get(base::DIR_TEMP, &dumps_path); if (!info->upload) - PathService::Get(breakpad::DIR_CRASH_DUMPS, &dumps_path); + PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path); const uint64 rand = base::RandUint64(); const std::string minidump_filename = base::StringPrintf("%s/chromium-%s-minidump-%016" PRIx64 ".dmp", diff --git a/chrome/browser/crash_upload_list.cc b/chrome/browser/crash_upload_list.cc index 20dd2d84e4eca4..911fec466b5d6f 100644 --- a/chrome/browser/crash_upload_list.cc +++ b/chrome/browser/crash_upload_list.cc @@ -6,10 +6,10 @@ #include "base/files/file_path.h" #include "base/path_service.h" +#include "chrome/common/chrome_paths.h" #if defined(OS_WIN) #include "chrome/browser/crash_upload_list_win.h" #endif -#include "components/breakpad/common/breakpad_paths.h" // static const char* CrashUploadList::kReporterLogFilename = "uploads.log"; @@ -17,7 +17,7 @@ const char* CrashUploadList::kReporterLogFilename = "uploads.log"; // static CrashUploadList* CrashUploadList::Create(Delegate* delegate) { base::FilePath crash_dir_path; - PathService::Get(breakpad::DIR_CRASH_DUMPS, &crash_dir_path); + PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dir_path); base::FilePath upload_log_path = crash_dir_path.AppendASCII(kReporterLogFilename); #if defined(OS_WIN) diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 36c64d5ebce197..db606892c1d78c 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -36,7 +36,6 @@ '<(DEPTH)/chrome/chrome_resources.gyp:chrome_strings', '<(DEPTH)/chrome/chrome_resources.gyp:theme_resources', '<(DEPTH)/chrome/common_constants.gyp:common_constants', - '<(DEPTH)/components/components.gyp:breakpad_common', '<(DEPTH)/components/components.gyp:visitedlink_common', '<(DEPTH)/content/content.gyp:content_common', '<(DEPTH)/net/net.gyp:net', diff --git a/chrome/common/DEPS b/chrome/common/DEPS index bb5d3865f03238..d223b13ca16078 100644 --- a/chrome/common/DEPS +++ b/chrome/common/DEPS @@ -3,7 +3,6 @@ include_rules = [ "+breakpad", # For Breakpad constants. "+chromeos", # For chromeos_switches.h "+components/autofill/core/common", - "+components/breakpad/common", "+components/nacl/common", "+device/bluetooth", # For BluetoothDevicePermission "+device/media_transfer_protocol", # For MediaTransferProtocolManager diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 3cec5acc0417a8..9c20980fb5ff5d 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -14,7 +14,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/widevine_cdm_constants.h" -#include "components/breakpad/common/breakpad_paths.h" #include "ui/base/ui_base_paths.h" #if defined(OS_ANDROID) @@ -191,6 +190,24 @@ bool PathProvider(int key, base::FilePath* result) { // and annoyed a lot of users. #endif break; + case chrome::DIR_CRASH_DUMPS: +#if defined(OS_CHROMEOS) + // ChromeOS uses a separate directory. See http://crosbug.com/25089 + cur = base::FilePath("/var/log/chrome"); +#elif defined(OS_ANDROID) + if (!base::android::GetCacheDirectory(&cur)) + return false; +#else + // The crash reports are always stored relative to the default user data + // directory. This avoids the problem of having to re-initialize the + // exception handler after parsing command line options, which may + // override the location of the app's profile directory. + if (!GetDefaultUserDataDirectory(&cur)) + return false; +#endif + cur = cur.Append(FILE_PATH_LITERAL("Crash Reports")); + create_dir = true; + break; case chrome::DIR_RESOURCES: #if defined(OS_MACOSX) cur = base::mac::FrameworkBundlePath(); @@ -479,25 +496,6 @@ bool PathProvider(int key, base::FilePath* result) { #endif break; - case breakpad::DIR_CRASH_DUMPS: -#if defined(OS_CHROMEOS) - // ChromeOS uses a separate directory. See http://crosbug.com/25089 - cur = base::FilePath("/var/log/chrome"); -#elif defined(OS_ANDROID) - if (!base::android::GetCacheDirectory(&cur)) - return false; -#else - // The crash reports are always stored relative to the default user data - // directory. This avoids the problem of having to re-initialize the - // exception handler after parsing command line options, which may - // override the location of the app's profile directory. - if (!GetDefaultUserDataDirectory(&cur)) - return false; -#endif - cur = cur.Append(FILE_PATH_LITERAL("Crash Reports")); - create_dir = true; - break; - default: return false; } @@ -514,8 +512,6 @@ bool PathProvider(int key, base::FilePath* result) { // eliminate this object file if there is no direct entry point into it. void RegisterPathProvider() { PathService::RegisterProvider(PathProvider, PATH_START, PATH_END); - PathService::RegisterProvider( - PathProvider, breakpad::PATH_START, breakpad::PATH_END); } } // namespace chrome diff --git a/chrome/common/chrome_paths.h b/chrome/common/chrome_paths.h index 717157bc0d89e4..a3b4dab382f75c 100644 --- a/chrome/common/chrome_paths.h +++ b/chrome/common/chrome_paths.h @@ -18,6 +18,7 @@ enum { DIR_APP = PATH_START, // Directory where dlls and data reside. DIR_LOGS, // Directory where logs should be written. DIR_USER_DATA, // Directory where user data can be written. + DIR_CRASH_DUMPS, // Directory where crash dumps are written. DIR_RESOURCES, // Directory containing separate file resources // used by Chrome at runtime. DIR_INSPECTOR, // Directory where web inspector is located. diff --git a/chrome/test/reliability/automated_ui_tests.cc b/chrome/test/reliability/automated_ui_tests.cc index 37e94a87edaa3d..10a0c2a2f7ab22 100644 --- a/chrome/test/reliability/automated_ui_tests.cc +++ b/chrome/test/reliability/automated_ui_tests.cc @@ -26,6 +26,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/ui/view_ids.h" +#include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" #include "chrome/common/url_constants.h" @@ -35,7 +36,6 @@ #include "chrome/test/automation/window_proxy.h" #include "chrome/test/reliability/automated_ui_tests.h" #include "chrome/test/ui/ui_test.h" -#include "components/breakpad/common/breakpad_paths.h" #include "googleurl/src/gurl.h" #include "ui/base/keycodes/keyboard_codes.h" @@ -767,7 +767,7 @@ void AutomatedUITest::LogInfoMessage(const std::string& info) { base::FilePath AutomatedUITest::GetMostRecentCrashDump() { base::FilePath crash_dump_path; base::FilePath most_recent_file_name; - PathService::Get(breakpad::DIR_CRASH_DUMPS, &crash_dump_path); + PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path); base::Time most_recent_file_time; bool first_file = true; diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc index 467ff100b9ade3..be5c9ec363b4cb 100644 --- a/chrome/test/reliability/page_load_test.cc +++ b/chrome/test/reliability/page_load_test.cc @@ -70,7 +70,6 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" -#include "components/breakpad/common/breakpad_paths.h" #include "net/base/net_util.h" #include "ui/base/keycodes/keyboard_codes.h" #include "v8/include/v8-testing.h" @@ -635,7 +634,7 @@ class PageLoadTest : public UITest { crash_dumps_dir_path_ = base::FilePath::FromUTF8Unsafe( alternate_minidump_location); } else { - PathService::Get(breakpad::DIR_CRASH_DUMPS, &crash_dumps_dir_path_); + PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dumps_dir_path_); } base::FileEnumerator enumerator(crash_dumps_dir_path_, diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 57c91649ff9c69..8154581f4b6f59 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -51,7 +51,6 @@ #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/testing_profile.h" -#include "components/breakpad/common/breakpad_paths.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" #include "ui/gl/gl_implementation.h" @@ -425,7 +424,7 @@ bool UITestBase::CloseBrowser(BrowserProxy* browser, int UITestBase::GetCrashCount() const { base::FilePath crash_dump_path; - PathService::Get(breakpad::DIR_CRASH_DUMPS, &crash_dump_path); + PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dump_path); int files_found = 0; base::FileEnumerator en(crash_dump_path, false, base::FileEnumerator::FILES); diff --git a/chrome/tools/DEPS b/chrome/tools/DEPS index d6cef979461966..b5d4427d6f4fb4 100644 --- a/chrome/tools/DEPS +++ b/chrome/tools/DEPS @@ -2,7 +2,6 @@ include_rules = [ "+breakpad", "+chrome/browser", "+chrome/third_party/hunspell/google", - "+components/breakpad", "+content/browser", "+content/public/browser", ] diff --git a/chrome/tools/crash_service/crash_service.cc b/chrome/tools/crash_service/crash_service.cc index a4b5050b89f3c4..ff36eca2bbe09b 100644 --- a/chrome/tools/crash_service/crash_service.cc +++ b/chrome/tools/crash_service/crash_service.cc @@ -20,7 +20,6 @@ #include "breakpad/src/client/windows/sender/crash_report_sender.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "components/breakpad/common/breakpad_paths.h" namespace { @@ -198,7 +197,7 @@ bool CrashService::Initialize(const std::wstring& command_line) { if (cmd_line.HasSwitch(kDumpsDir)) { dumps_path = base::FilePath(cmd_line.GetSwitchValueNative(kDumpsDir)); } else { - if (!PathService::Get(breakpad::DIR_CRASH_DUMPS, &dumps_path)) { + if (!PathService::Get(chrome::DIR_CRASH_DUMPS, &dumps_path)) { LOG(ERROR) << "could not get DIR_CRASH_DUMPS"; return false; } diff --git a/chrome_frame/test/reliability/page_load_test.cc b/chrome_frame/test/reliability/page_load_test.cc index 147859b0e0e577..101af0a7b46857 100644 --- a/chrome_frame/test/reliability/page_load_test.cc +++ b/chrome_frame/test/reliability/page_load_test.cc @@ -56,7 +56,6 @@ #include "chrome_frame/test/ie_event_sink.h" #include "chrome_frame/test/reliability/page_load_test.h" #include "chrome_frame/utils.h" -#include "components/breakpad/common/breakpad_paths.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread.h" #include "net/base/net_util.h" @@ -333,7 +332,7 @@ class PageLoadTest : public testing::Test { protected: virtual void SetUp() { // Initialize crash_dumps_dir_path_. - PathService::Get(breakpad::DIR_CRASH_DUMPS, &crash_dumps_dir_path_); + PathService::Get(chrome::DIR_CRASH_DUMPS, &crash_dumps_dir_path_); base::FileEnumerator enumerator(crash_dumps_dir_path_, false, // not recursive base::FileEnumerator::FILES); diff --git a/components/OWNERS b/components/OWNERS index 2bdde1ee2707f0..7bb370c96090ee 100644 --- a/components/OWNERS +++ b/components/OWNERS @@ -4,10 +4,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 tracing*=jbauman@chromium.org per-file tracing*=nduca@chromium.org diff --git a/components/breakpad.gypi b/components/breakpad.gypi deleted file mode 100644 index 25bbcb09390b13..00000000000000 --- a/components/breakpad.gypi +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2013 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. - -{ - 'targets': [ - { - 'target_name': 'breakpad_common', - # TODO(jochen): should be static_library, once there are actual .cc files. - 'type': 'none', - 'dependencies': [ - '../base/base.gyp:base', - ], - 'sources': [ - 'breakpad/common/breakpad_paths.h', - ], - }, - ], -} diff --git a/components/breakpad/OWNERS b/components/breakpad/OWNERS deleted file mode 100644 index 8797356fc92006..00000000000000 --- a/components/breakpad/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -jochen@chromium.org -rsesek@chromium.org -thestig@chromum.org diff --git a/components/breakpad/common/breakpad_paths.h b/components/breakpad/common/breakpad_paths.h deleted file mode 100644 index ff053592366daa..00000000000000 --- a/components/breakpad/common/breakpad_paths.h +++ /dev/null @@ -1,22 +0,0 @@ -// Copyright 2013 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 COMPONENTS_BREAKPAD_COMMON_BREAKPAD_PATHS_H_ -#define COMPONENTS_BREAKPAD_COMMON_BREAKPAD_PATHS_H_ - -namespace breakpad { - -enum { - PATH_START = 8000, - - // Directory where crash dumps are written. The embedder of the breakpad - // component has to define DIR_CRASH_DUMPS using PathService::Override. - DIR_CRASH_DUMPS = PATH_START, - - PATH_END -}; - -} // namespace breakpad - -#endif // COMPONENTS_BREAKPAD_COMMON_BREAKPAD_PATHS_H_ diff --git a/components/components.gyp b/components/components.gyp index 61c496c19d6aad..c3617390036496 100644 --- a/components/components.gyp +++ b/components/components.gyp @@ -12,7 +12,6 @@ 'includes': [ 'autofill.gypi', 'auto_login_parser.gypi', - 'breakpad.gypi', 'browser_context_keyed_service.gypi', 'components_tests.gypi', 'navigation_interception.gypi',