From 9e2a3137641bc104980e13388b6088d3f4a9b52f Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Fri, 7 Oct 2011 05:07:40 +0000 Subject: Switch remoting/protocol to new callbacks There is still some code that uses old callbacks (particularly unittests) - I will convert them in a separate CL. BUG=None TEST=Unittests Review URL: http://codereview.chromium.org/8116021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104440 0039d316-1c4b-4281-b951-d872f2087c98 --- remoting/protocol/protocol_mock_objects.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'remoting/protocol/protocol_mock_objects.h') diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h index 814e61b..6bc97d6 100644 --- a/remoting/protocol/protocol_mock_objects.h +++ b/remoting/protocol/protocol_mock_objects.h @@ -70,7 +70,8 @@ class MockHostStub : public HostStub { ~MockHostStub(); MOCK_METHOD2(BeginSessionRequest, - void(const LocalLoginCredentials* credentials, Task* done)); + void(const LocalLoginCredentials* credentials, + const base::Closure& done)); private: DISALLOW_COPY_AND_ASSIGN(MockHostStub); @@ -82,9 +83,9 @@ class MockClientStub : public ClientStub { virtual ~MockClientStub(); MOCK_METHOD2(NotifyResolution, void(const NotifyResolutionRequest* msg, - Task* done)); + const base::Closure& done)); MOCK_METHOD2(BeginSessionResponse, void(const LocalLoginStatus* msg, - Task* done)); + const base::Closure& done)); private: DISALLOW_COPY_AND_ASSIGN(MockClientStub); @@ -96,7 +97,7 @@ class MockVideoStub : public VideoStub { virtual ~MockVideoStub(); MOCK_METHOD2(ProcessVideoPacket, void(const VideoPacket* video_packet, - Task* done)); + const base::Closure& done)); MOCK_METHOD0(GetPendingPackets, int()); private: @@ -108,7 +109,8 @@ class MockSession : public Session { MockSession(); virtual ~MockSession(); - MOCK_METHOD1(SetStateChangeCallback, void(StateChangeCallback* callback)); + MOCK_METHOD1(SetStateChangeCallback, + void(const StateChangeCallback& callback)); MOCK_METHOD0(error, Session::Error()); MOCK_METHOD2(CreateStreamChannel, void( const std::string& name, const StreamChannelCallback& callback)); -- cgit v1.1