| Index: remoting/test/protocol_perftest.cc
|
| diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc
|
| index 83d015beb04814543031f7ec4c80036149cc1c8f..86d4bec570b1c12cda01f66a0cef04148c86ff1a 100644
|
| --- a/remoting/test/protocol_perftest.cc
|
| +++ b/remoting/test/protocol_perftest.cc
|
| @@ -64,11 +64,10 @@ struct NetworkPerformanceParams {
|
| class FakeCursorShapeStub : public protocol::CursorShapeStub {
|
| public:
|
| FakeCursorShapeStub() {}
|
| - virtual ~FakeCursorShapeStub() {}
|
| + ~FakeCursorShapeStub() override {}
|
|
|
| // protocol::CursorShapeStub interface.
|
| - virtual void SetCursorShape(
|
| - const protocol::CursorShapeInfo& cursor_shape) override {};
|
| + void SetCursorShape(const protocol::CursorShapeInfo& cursor_shape) override{};
|
| };
|
|
|
| class ProtocolPerfTest
|
| @@ -97,35 +96,31 @@ class ProtocolPerfTest
|
| }
|
|
|
| // ClientUserInterface interface.
|
| - virtual void OnConnectionState(protocol::ConnectionToHost::State state,
|
| - protocol::ErrorCode error) override {
|
| + void OnConnectionState(protocol::ConnectionToHost::State state,
|
| + protocol::ErrorCode error) override {
|
| if (state == protocol::ConnectionToHost::CONNECTED) {
|
| client_connected_ = true;
|
| if (host_connected_)
|
| connecting_loop_->Quit();
|
| }
|
| }
|
| - virtual void OnConnectionReady(bool ready) override {}
|
| - virtual void OnRouteChanged(const std::string& channel_name,
|
| - const protocol::TransportRoute& route) override {
|
| - }
|
| - virtual void SetCapabilities(const std::string& capabilities) override {}
|
| - virtual void SetPairingResponse(
|
| + void OnConnectionReady(bool ready) override {}
|
| + void OnRouteChanged(const std::string& channel_name,
|
| + const protocol::TransportRoute& route) override {}
|
| + void SetCapabilities(const std::string& capabilities) override {}
|
| + void SetPairingResponse(
|
| const protocol::PairingResponse& pairing_response) override {}
|
| - virtual void DeliverHostMessage(
|
| - const protocol::ExtensionMessage& message) override {}
|
| - virtual protocol::ClipboardStub* GetClipboardStub() override {
|
| - return NULL;
|
| - }
|
| - virtual protocol::CursorShapeStub* GetCursorShapeStub() override {
|
| + void DeliverHostMessage(const protocol::ExtensionMessage& message) override {}
|
| + protocol::ClipboardStub* GetClipboardStub() override { return NULL; }
|
| + protocol::CursorShapeStub* GetCursorShapeStub() override {
|
| return &cursor_shape_stub_;
|
| }
|
|
|
| // VideoRenderer interface.
|
| - virtual void Initialize(const protocol::SessionConfig& config) override {}
|
| - virtual ChromotingStats* GetStats() override { return NULL; }
|
| - virtual void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
|
| - const base::Closure& done) override {
|
| + void Initialize(const protocol::SessionConfig& config) override {}
|
| + ChromotingStats* GetStats() override { return NULL; }
|
| + void ProcessVideoPacket(scoped_ptr<VideoPacket> video_packet,
|
| + const base::Closure& done) override {
|
| if (video_packet->data().empty()) {
|
| // Ignore keep-alive packets
|
| done.Run();
|
| @@ -141,7 +136,7 @@ class ProtocolPerfTest
|
| }
|
|
|
| // HostStatusObserver interface.
|
| - virtual void OnClientConnected(const std::string& jid) override {
|
| + void OnClientConnected(const std::string& jid) override {
|
| message_loop_.PostTask(
|
| FROM_HERE,
|
| base::Bind(&ProtocolPerfTest::OnHostConnectedMainThread,
|
|
|