Roll Breakpad to @970

remoting/base/breakpad_win_unittest.cc

 // 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.
 
 #include <stdio.h>
 
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 71 matching lines @@
               guid.Data4[6], guid.Data4[7]);
       bool result = environment->SetVar(kPipeVariableName,
                                         UTF16ToUTF8(pipe_name_));
       EXPECT_TRUE(result);
 
       // Setup a dummy crash dump server.
       callbacks_.reset(new MockCrashServerCallbacks());
       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();
       ASSERT_TRUE(result);
     }
   }
 
  protected:
   scoped_ptr<google_breakpad::CrashGenerationServer> crash_server_;
   scoped_ptr<MockCrashServerCallbacks> callbacks_;
@@ skipping 21 matching lines @@
 TEST_F(BreakpadWinDeathTest, TestDebugbreak) {
   if (callbacks_.get()) {
     EXPECT_CALL(*callbacks_, OnClientDumpRequested());
   }
 
   // See if __debugbreak() is intercepted.
   ASSERT_DEATH(__debugbreak(), "");
 }
 
 }  // namespace remoting