| Index: remoting/protocol/protocol_mock_objects.h
|
| diff --git a/remoting/protocol/protocol_mock_objects.h b/remoting/protocol/protocol_mock_objects.h
|
| index 814e61be2003ea49daa07824c9adba281fd9223c..6bc97d67f10c1a2106fd550a3fa16dc7763e421b 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));
|
|
|