diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 18:50:59 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-23 18:50:59 +0000 |
| commit | b45dd1e2fbf4d2a42f0ca62f6bad34861e925539 (patch) | |
| tree | af7c4d63fb28b19df3753e9fe5c10ab36ad392ee | |
| parent | 37d9092dca691beb954998b2a0f55dd3bdabc596 (diff) | |
| download | chromium_src-b45dd1e2fbf4d2a42f0ca62f6bad34861e925539.zip chromium_src-b45dd1e2fbf4d2a42f0ca62f6bad34861e925539.tar.gz chromium_src-b45dd1e2fbf4d2a42f0ca62f6bad34861e925539.tar.bz2 | |
Roll DEPS for Breakpad r692:r697, try 3.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/3432019
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60320 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 25 | ||||
| -rw-r--r-- | chrome/tools/crash_service/crash_service.cc | 7 |
3 files changed, 28 insertions, 6 deletions
@@ -14,7 +14,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@692", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@697", "src/build/util/support": "/trunk/deps/support@20411", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index d966781..35389e3 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -321,6 +321,30 @@ ], }, { + # Breakpad r693 uses some files from src/processor in unit tests. + 'target_name': 'breakpad_processor_support', + 'type': '<(library)', + + 'sources': [ + 'src/processor/basic_code_modules.cc', + 'src/processor/basic_code_modules.h', + 'src/processor/logging.cc', + 'src/processor/logging.h', + 'src/processor/minidump.cc', + 'src/processor/minidump.h', + 'src/processor/pathname_stripper.cc', + 'src/processor/pathname_stripper.h', + ], + + 'include_dirs': [ + 'src', + 'src/client', + 'src/third_party/linux/include', + '..', + '.', + ], + }, + { 'target_name': 'breakpad_unittests', 'type': 'executable', 'dependencies': [ @@ -328,6 +352,7 @@ '../testing/gtest.gyp:gtestmain', '../testing/gmock.gyp:gmock', 'breakpad_client', + 'breakpad_processor_support', ], 'sources': [ diff --git a/chrome/tools/crash_service/crash_service.cc b/chrome/tools/crash_service/crash_service.cc index 09768fa..fb2fa49 100644 --- a/chrome/tools/crash_service/crash_service.cc +++ b/chrome/tools/crash_service/crash_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -15,14 +15,12 @@ #include "base/logging.h" #include "base/path_service.h" #include "base/win_util.h" +#include "breakpad/src/client/windows/crash_generation/client_info.h" #include "breakpad/src/client/windows/crash_generation/crash_generation_server.h" #include "breakpad/src/client/windows/sender/crash_report_sender.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -// TODO(cpu): Bug 1169078. There is a laundry list of things to do for this -// application. They will be addressed as they are required. - namespace { const wchar_t kTestPipeName[] = L"\\\\.\\pipe\\ChromeCrashServices"; @@ -478,4 +476,3 @@ PSECURITY_DESCRIPTOR CrashService::GetSecurityDescriptorForLowIntegrity() { return NULL; } - |