diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 19:44:19 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 19:44:19 +0000 |
| commit | 6795e7bf54387c8d7579b71ce6b97047da2ddca9 (patch) | |
| tree | 12078eb263faae8f9c0eb6b911178404b4747622 /remoting/base | |
| parent | d4c96e2310a06ae542277e79e35ffd70f80f80be (diff) | |
| download | chromium_src-6795e7bf54387c8d7579b71ce6b97047da2ddca9.zip chromium_src-6795e7bf54387c8d7579b71ce6b97047da2ddca9.tar.gz chromium_src-6795e7bf54387c8d7579b71ce6b97047da2ddca9.tar.bz2 | |
Roll Breakpad to @970.
Add two NULL parameters to CrashGenerationServer ctor to match the new prototype (changed in r952)
Add the files appeared in r945 to breakpad.gyp
BUG=127776,132164
TEST=remoting_unittests.BreakpadWinDeathTest.*
Review URL: https://chromiumcodereview.appspot.com/10544121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/base')
| -rw-r--r-- | remoting/base/breakpad_win_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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(); |