diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | breakpad/breakpad.gyp | 2 | ||||
| -rw-r--r-- | chrome/tools/crash_service/crash_service.cc | 4 |
3 files changed, 2 insertions, 6 deletions
@@ -65,7 +65,7 @@ vars = { deps = { "src/breakpad/src": - (Var("googlecode_url") % "google-breakpad") + "/trunk/src@963", + (Var("googlecode_url") % "google-breakpad") + "/trunk/src@939", "src/build/util/support": "/trunk/deps/support@20411", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index 2ee6fcd..6ecab03 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -474,8 +474,6 @@ '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 a1b30ff..ba2acbc 100644 --- a/chrome/tools/crash_service/crash_service.cc +++ b/chrome/tools/crash_service/crash_service.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,8 +246,6 @@ bool CrashService::Initialize(const std::wstring& command_line) { &CrashService::OnClientConnected, this, &CrashService::OnClientDumpRequest, this, &CrashService::OnClientExited, this, - /*upload_request_callback*/ NULL, - /* upload_context */ NULL, true, &dumps_path.value()); if (!dumper_) { |