diff options
author | mostynb <mostynb@opera.com> | 2014-10-08 09:58:09 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-10-08 16:59:03 +0000 |
commit | 11d989c52c6da43c5e8eb9d377ef0286a1cc8fba (patch) | |
tree | f2cb68b6b799bbfcdce2a51e72f69aa0164bb845 /remoting/test | |
parent | c9d7a691bb7a1c5cfeeddfc29f227215a9338045 (diff) | |
download | chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.zip chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.gz chromium_src-11d989c52c6da43c5e8eb9d377ef0286a1cc8fba.tar.bz2 |
replace OVERRIDE and FINAL with override and final in remoting/
BUG=417463
Review URL: https://codereview.chromium.org/628753002
Cr-Commit-Position: refs/heads/master@{#298734}
Diffstat (limited to 'remoting/test')
-rw-r--r-- | remoting/test/fake_network_manager.h | 6 | ||||
-rw-r--r-- | remoting/test/fake_port_allocator.cc | 4 | ||||
-rw-r--r-- | remoting/test/fake_port_allocator.h | 2 | ||||
-rw-r--r-- | remoting/test/fake_socket_factory.cc | 20 | ||||
-rw-r--r-- | remoting/test/fake_socket_factory.h | 14 | ||||
-rw-r--r-- | remoting/test/protocol_perftest.cc | 26 |
6 files changed, 36 insertions, 36 deletions
diff --git a/remoting/test/fake_network_manager.h b/remoting/test/fake_network_manager.h index 20788b5..0dea2ba 100644 --- a/remoting/test/fake_network_manager.h +++ b/remoting/test/fake_network_manager.h @@ -19,9 +19,9 @@ class FakeNetworkManager : public rtc::NetworkManager { virtual ~FakeNetworkManager(); // rtc::NetworkManager interface. - virtual void StartUpdating() OVERRIDE; - virtual void StopUpdating() OVERRIDE; - virtual void GetNetworks(NetworkList* networks) const OVERRIDE; + virtual void StartUpdating() override; + virtual void StopUpdating() override; + virtual void GetNetworks(NetworkList* networks) const override; protected: void SendNetworksChangedSignal(); diff --git a/remoting/test/fake_port_allocator.cc b/remoting/test/fake_port_allocator.cc index 0a96f1e..45d8f19 100644 --- a/remoting/test/fake_port_allocator.cc +++ b/remoting/test/fake_port_allocator.cc @@ -27,8 +27,8 @@ class FakePortAllocatorSession virtual ~FakePortAllocatorSession(); // cricket::HttpPortAllocatorBase overrides. - virtual void ConfigReady(cricket::PortConfiguration* config) OVERRIDE; - virtual void SendSessionRequest(const std::string& host, int port) OVERRIDE; + virtual void ConfigReady(cricket::PortConfiguration* config) override; + virtual void SendSessionRequest(const std::string& host, int port) override; private: DISALLOW_COPY_AND_ASSIGN(FakePortAllocatorSession); diff --git a/remoting/test/fake_port_allocator.h b/remoting/test/fake_port_allocator.h index 18fd7bd..ca50ae5 100644 --- a/remoting/test/fake_port_allocator.h +++ b/remoting/test/fake_port_allocator.h @@ -30,7 +30,7 @@ class FakePortAllocator : public cricket::HttpPortAllocatorBase { const std::string& content_name, int component, const std::string& ice_username_fragment, - const std::string& ice_password) OVERRIDE; + const std::string& ice_password) override; private: FakePortAllocator(scoped_ptr<rtc::NetworkManager> network_manager, diff --git a/remoting/test/fake_socket_factory.cc b/remoting/test/fake_socket_factory.cc index c9b927d..8bb05b5 100644 --- a/remoting/test/fake_socket_factory.cc +++ b/remoting/test/fake_socket_factory.cc @@ -47,19 +47,19 @@ class FakeUdpSocket : public rtc::AsyncPacketSocket { int data_size); // rtc::AsyncPacketSocket interface. - virtual rtc::SocketAddress GetLocalAddress() const OVERRIDE; - virtual rtc::SocketAddress GetRemoteAddress() const OVERRIDE; + virtual rtc::SocketAddress GetLocalAddress() const override; + virtual rtc::SocketAddress GetRemoteAddress() const override; virtual int Send(const void* data, size_t data_size, - const rtc::PacketOptions& options) OVERRIDE; + const rtc::PacketOptions& options) override; virtual int SendTo(const void* data, size_t data_size, const rtc::SocketAddress& address, - const rtc::PacketOptions& options) OVERRIDE; - virtual int Close() OVERRIDE; - virtual State GetState() const OVERRIDE; - virtual int GetOption(rtc::Socket::Option option, int* value) OVERRIDE; - virtual int SetOption(rtc::Socket::Option option, int value) OVERRIDE; - virtual int GetError() const OVERRIDE; - virtual void SetError(int error) OVERRIDE; + const rtc::PacketOptions& options) override; + virtual int Close() override; + virtual State GetState() const override; + virtual int GetOption(rtc::Socket::Option option, int* value) override; + virtual int SetOption(rtc::Socket::Option option, int value) override; + virtual int GetError() const override; + virtual void SetError(int error) override; private: FakePacketSocketFactory* factory_; diff --git a/remoting/test/fake_socket_factory.h b/remoting/test/fake_socket_factory.h index c7efdab..02784e8 100644 --- a/remoting/test/fake_socket_factory.h +++ b/remoting/test/fake_socket_factory.h @@ -52,27 +52,27 @@ class FakePacketSocketFactory : public rtc::PacketSocketFactory, // rtc::PacketSocketFactory interface. virtual rtc::AsyncPacketSocket* CreateUdpSocket( const rtc::SocketAddress& local_address, - int min_port, int max_port) OVERRIDE; + int min_port, int max_port) override; virtual rtc::AsyncPacketSocket* CreateServerTcpSocket( const rtc::SocketAddress& local_address, int min_port, int max_port, - int opts) OVERRIDE; + int opts) override; virtual rtc::AsyncPacketSocket* CreateClientTcpSocket( const rtc::SocketAddress& local_address, const rtc::SocketAddress& remote_address, const rtc::ProxyInfo& proxy_info, const std::string& user_agent, - int opts) OVERRIDE; - virtual rtc::AsyncResolverInterface* CreateAsyncResolver() OVERRIDE; + int opts) override; + virtual rtc::AsyncResolverInterface* CreateAsyncResolver() override; // FakeNetworkDispatcher::Node interface. virtual const scoped_refptr<base::SingleThreadTaskRunner>& GetThread() - const OVERRIDE; - virtual const rtc::IPAddress& GetAddress() const OVERRIDE; + const override; + virtual const rtc::IPAddress& GetAddress() const override; virtual void ReceivePacket(const rtc::SocketAddress& from, const rtc::SocketAddress& to, const scoped_refptr<net::IOBuffer>& data, - int data_size) OVERRIDE; + int data_size) override; private: struct PendingPacket { diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc index a9cd445..83d015b 100644 --- a/remoting/test/protocol_perftest.cc +++ b/remoting/test/protocol_perftest.cc @@ -68,7 +68,7 @@ class FakeCursorShapeStub : public protocol::CursorShapeStub { // protocol::CursorShapeStub interface. virtual void SetCursorShape( - const protocol::CursorShapeInfo& cursor_shape) OVERRIDE {}; + const protocol::CursorShapeInfo& cursor_shape) override {}; }; class ProtocolPerfTest @@ -98,34 +98,34 @@ class ProtocolPerfTest // ClientUserInterface interface. virtual void OnConnectionState(protocol::ConnectionToHost::State state, - protocol::ErrorCode error) OVERRIDE { + 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 OnConnectionReady(bool ready) override {} virtual void OnRouteChanged(const std::string& channel_name, - const protocol::TransportRoute& route) OVERRIDE { + const protocol::TransportRoute& route) override { } - virtual void SetCapabilities(const std::string& capabilities) OVERRIDE {} + virtual void SetCapabilities(const std::string& capabilities) override {} virtual void SetPairingResponse( - const protocol::PairingResponse& pairing_response) OVERRIDE {} + const protocol::PairingResponse& pairing_response) override {} virtual void DeliverHostMessage( - const protocol::ExtensionMessage& message) OVERRIDE {} - virtual protocol::ClipboardStub* GetClipboardStub() OVERRIDE { + const protocol::ExtensionMessage& message) override {} + virtual protocol::ClipboardStub* GetClipboardStub() override { return NULL; } - virtual protocol::CursorShapeStub* GetCursorShapeStub() OVERRIDE { + virtual 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 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 { + const base::Closure& done) override { if (video_packet->data().empty()) { // Ignore keep-alive packets done.Run(); @@ -141,7 +141,7 @@ class ProtocolPerfTest } // HostStatusObserver interface. - virtual void OnClientConnected(const std::string& jid) OVERRIDE { + virtual void OnClientConnected(const std::string& jid) override { message_loop_.PostTask( FROM_HERE, base::Bind(&ProtocolPerfTest::OnHostConnectedMainThread, |