diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-24 04:35:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-24 04:35:24 +0000 |
| commit | 125a7ba65ad10ace9edcf36d6943ce9ae2bdc1d6 (patch) | |
| tree | cd3ca6d99ffe80195d207e26d1778a93c1c49c20 | |
| parent | 439f8d667314e147d0cd3ebc650ae287fb9fb261 (diff) | |
| download | chromium_src-125a7ba65ad10ace9edcf36d6943ce9ae2bdc1d6.zip chromium_src-125a7ba65ad10ace9edcf36d6943ce9ae2bdc1d6.tar.gz chromium_src-125a7ba65ad10ace9edcf36d6943ce9ae2bdc1d6.tar.bz2 | |
Fix problems with my previous patch (r70105) with gmock.
TBR=joi
Review URL: http://codereview.chromium.org/6010005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70138 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/extension_uitest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_uitest.cc b/chrome/browser/extensions/extension_uitest.cc index 9ead4ed..845696e 100644 --- a/chrome/browser/extensions/extension_uitest.cc +++ b/chrome/browser/extensions/extension_uitest.cc @@ -134,7 +134,7 @@ TEST_F(ExtensionTestSimpleApiCall, FLAKY_RunTest) { EXPECT_CALL(*mock_, OnForwardMessageToExternalHost( _, keys::kAutomationOrigin, keys::kAutomationRequestTarget)) .WillOnce(DoAll( - SaveArg<1>(&message_received), + SaveArg<0>(&message_received), InvokeWithoutArgs( CreateFunctor(&loop_, &TimedMessageLoopRunner::Quit)))); @@ -285,7 +285,7 @@ TEST_F(ExtensionTestRoundtripApiCall, FLAKY_RunTest) { EXPECT_CALL(*mock_, OnForwardMessageToExternalHost( _, keys::kAutomationOrigin, keys::kAutomationRequestTarget)) .Times(2) - .WillRepeatedly(WithArgs<1>(Invoke( + .WillRepeatedly(WithArgs<0>(Invoke( CreateFunctor(this, &ExtensionTestRoundtripApiCall::CheckAndSendResponse)))); @@ -472,7 +472,7 @@ TEST_F(ExtensionTestBrowserEvents, FLAKY_RunTest) { EXPECT_CALL(*mock_, OnForwardMessageToExternalHost( _, keys::kAutomationOrigin, _)) - .WillRepeatedly(WithArgs<1, 2>(Invoke( + .WillRepeatedly(WithArgs<0, 2>(Invoke( CreateFunctor(this, &ExtensionTestBrowserEvents::HandleMessageFromChrome)))); |