diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 2 | ||||
| -rw-r--r-- | chrome/tools/crash_service/crash_service.cc | 3 | ||||
| -rw-r--r-- | remoting/base/breakpad_win_unittest.cc | 5 |
4 files changed, 8 insertions, 4 deletions
@@ -68,7 +68,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@939", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@970", "src/googleurl": (Var("googlecode_url") % "google-url") + "/trunk@175", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 6ecab03..2ee6fcd 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -474,6 +474,8 @@ 'src/client/linux/crash_generation/crash_generation_client.cc', 'src/client/linux/crash_generation/crash_generation_client.h', 'src/client/linux/handler/exception_handler.cc', + 'src/client/linux/log/log.cc', + 'src/client/linux/log/log.h', 'src/client/linux/minidump_writer/directory_reader.h', 'src/client/linux/minidump_writer/line_reader.h', 'src/client/linux/minidump_writer/linux_core_dumper.cc', diff --git a/chrome/tools/crash_service/crash_service.cc b/chrome/tools/crash_service/crash_service.cc index ba2acbc..17f0116 100644 --- a/chrome/tools/crash_service/crash_service.cc +++ b/chrome/tools/crash_service/crash_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -246,6 +246,7 @@ bool CrashService::Initialize(const std::wstring& command_line) { &CrashService::OnClientConnected, this, &CrashService::OnClientDumpRequest, this, &CrashService::OnClientExited, this, + NULL, NULL, true, &dumps_path.value()); if (!dumper_) { diff --git a/remoting/base/breakpad_win_unittest.cc b/remoting/base/breakpad_win_unittest.cc index d0b59a0..859dba9 100644 --- a/remoting/base/breakpad_win_unittest.cc +++ b/remoting/base/breakpad_win_unittest.cc @@ -89,10 +89,11 @@ class BreakpadWinDeathTest : public testing::Test { crash_server_.reset( new google_breakpad::CrashGenerationServer( pipe_name_, NULL, - NULL, 0, + NULL, NULL, MockCrashServerCallbacks::OnClientDumpRequestCallback, callbacks_.get(), - NULL, 0, + NULL, NULL, + NULL, NULL, false, NULL)); result = crash_server_->Start(); |