Revert 148133 - Roll breakpad DEPS r977:995

Reverting because we believe it is causing Windows NaCL builds to fail.

BUG=137676
TEST=none
TBR=deps

Review URL: https://chromiumcodereview.appspot.com/10805065

TBR=rsesek@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10806095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148154 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 4 insertions, 23 deletions

diff --git a/DEPS b/DEPS
index 9b6f91b..ab33701 100644
--- a/DEPS
+++ b/DEPS
@@ -69,7 +69,7 @@ vars = {
 
 deps = {
   "src/breakpad/src":
-    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@995",
+    (Var("googlecode_url") % "google-breakpad") + "/trunk/src@977",
 
   "src/googleurl":
     (Var("googlecode_url") % "google-url") + "/trunk@175",
diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp
index a2d41dd..2ee6fcd 100644
--- a/breakpad/breakpad.gyp
+++ b/breakpad/breakpad.gyp
@@ -436,8 +436,6 @@
                 'src/common/linux/dump_symbols.h',
                 'src/common/linux/elf_symbols_to_module.cc',
                 'src/common/linux/elf_symbols_to_module.h',
-                'src/common/linux/elfutils.cc',
-                'src/common/linux/elfutils.h',
                 'src/common/linux/file_id.cc',
                 'src/common/linux/file_id.h',
                 'src/common/linux/memory_mapped_file.cc',
@@ -495,8 +493,6 @@
             'src/common/convert_UTF.h',
             'src/common/linux/elf_core_dump.cc',
             'src/common/linux/elf_core_dump.h',
-            'src/common/linux/elfutils.cc',
-            'src/common/linux/elfutils.h',
             'src/common/linux/file_id.cc',
             'src/common/linux/file_id.h',
             'src/common/linux/google_crashdump_uploader.cc',
@@ -554,7 +550,6 @@
             'src/processor/minidump.cc',
             'src/processor/pathname_stripper.cc',
             'src/processor/pathname_stripper.h',
-            'src/processor/scoped_ptr.h',
           ],
 
           'include_dirs': [
@@ -585,8 +580,6 @@
             'src/client/linux/minidump_writer/linux_core_dumper_unittest.cc',
             'src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc',
             'src/client/linux/minidump_writer/minidump_writer_unittest.cc',
-            'src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc',
-            'src/client/linux/minidump_writer/minidump_writer_unittest_utils.h',
             'src/common/linux/elf_core_dump_unittest.cc',
             'src/common/linux/file_id_unittest.cc',
             'src/common/linux/linux_libc_support_unittest.cc',
@@ -613,14 +606,12 @@
           'target_name': 'linux_dumper_unittest_helper',
           'type': 'executable',
           'dependencies': [
-            'breakpad_processor_support',
           ],
           'sources': [
             'src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc',
           ],
 
           'include_dirs': [
-            'src',
             '..',
           ],
         },
diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 0b13870..70e1e05 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -182,21 +182,11 @@ void TestShell::InitializeTestShell(bool layout_test_mode,
         parsed_command_line.GetSwitchValueNative(test_shell::kCrashDumps));
     if (parsed_command_line.HasSwitch(test_shell::kCrashDumpsFulldump)) {
         new google_breakpad::ExceptionHandler(
-            dir,  // dump_path
-            NULL,  // filter
-            &MinidumpCallback,  // callback
-            NULL,  // callback_context
-            google_breakpad::ExceptionHandler::HANDLER_ALL,  // handler_types
-            kFullDumpType,  // dump_type
-            static_cast<const wchar_t*>(NULL),  // pipe_name
-            NULL);  // custom_info
+            dir, 0, &MinidumpCallback, 0, true,
+            kFullDumpType, 0, 0);
     } else {
         new google_breakpad::ExceptionHandler(
-            dir,  // dump_path
-            NULL,  // filter
-            &MinidumpCallback,  // callback
-            NULL,  // callback_context
-            google_breakpad::ExceptionHandler::HANDLER_ALL);  // handler_tpes
+            dir, 0, &MinidumpCallback, 0, true);
     }
   }
 }