diff options
55 files changed, 130 insertions, 154 deletions
diff --git a/remoting/base/auto_thread_unittest.cc b/remoting/base/auto_thread_unittest.cc index 1e14cfa..365f2e2 100644 --- a/remoting/base/auto_thread_unittest.cc +++ b/remoting/base/auto_thread_unittest.cc @@ -72,14 +72,14 @@ class AutoThreadTest : public testing::Test { message_loop_.Run(); } - virtual void SetUp() override { + void SetUp() override { main_task_runner_ = new AutoThreadTaskRunner( message_loop_.message_loop_proxy(), base::Bind(&AutoThreadTest::QuitMainMessageLoop, base::Unretained(this))); } - virtual void TearDown() override { + void TearDown() override { // Verify that |message_loop_| was quit by the AutoThreadTaskRunner. EXPECT_TRUE(message_loop_quit_correctly_); } diff --git a/remoting/base/compound_buffer_unittest.cc b/remoting/base/compound_buffer_unittest.cc index c6dde77..e5f4bef 100644 --- a/remoting/base/compound_buffer_unittest.cc +++ b/remoting/base/compound_buffer_unittest.cc @@ -73,7 +73,7 @@ class CompoundBufferTest : public testing::Test { } protected: - virtual void SetUp() { + void SetUp() override { data_ = new IOBuffer(kDataSize); for (int i = 0; i < kDataSize; ++i) { data_->data()[i] = i; diff --git a/remoting/base/resources_unittest.cc b/remoting/base/resources_unittest.cc index 65b4468..a684b2c 100644 --- a/remoting/base/resources_unittest.cc +++ b/remoting/base/resources_unittest.cc @@ -15,13 +15,9 @@ class ResourcesTest : public testing::Test { ResourcesTest(): resources_available_(false) { } - virtual void SetUp() override { - resources_available_ = LoadResources("en-US"); - } + void SetUp() override { resources_available_ = LoadResources("en-US"); } - virtual void TearDown() override { - UnloadResources(); - } + void TearDown() override { UnloadResources(); } bool resources_available_; }; diff --git a/remoting/client/audio_player_unittest.cc b/remoting/client/audio_player_unittest.cc index 733bf24..8084ee5 100644 --- a/remoting/client/audio_player_unittest.cc +++ b/remoting/client/audio_player_unittest.cc @@ -36,13 +36,12 @@ class FakeAudioPlayer : public AudioPlayer { class AudioPlayerTest : public ::testing::Test { protected: - virtual void SetUp() { + void SetUp() override { audio_.reset(new FakeAudioPlayer()); buffer_.reset(new char[kAudioFrameBytes + kPaddingBytes]); } - virtual void TearDown() { - } + void TearDown() override {} void ConsumeAudioFrame() { uint8* buffer = reinterpret_cast<uint8*>(buffer_.get()); diff --git a/remoting/client/client_status_logger_unittest.cc b/remoting/client/client_status_logger_unittest.cc index 26c56d0..0660fdc 100644 --- a/remoting/client/client_status_logger_unittest.cc +++ b/remoting/client/client_status_logger_unittest.cc @@ -65,7 +65,7 @@ MATCHER(IsStatisticsLog, "") { class ClientStatusLoggerTest : public testing::Test { public: ClientStatusLoggerTest() {} - virtual void SetUp() override { + void SetUp() override { EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, RemoveListener(_)); message_loop_proxy_ = base::MessageLoopProxy::current(); diff --git a/remoting/host/audio_capturer_linux.h b/remoting/host/audio_capturer_linux.h index 6f29a1b..a90d2a2 100644 --- a/remoting/host/audio_capturer_linux.h +++ b/remoting/host/audio_capturer_linux.h @@ -30,15 +30,15 @@ class AudioCapturerLinux : public AudioCapturer, explicit AudioCapturerLinux( scoped_refptr<AudioPipeReader> pipe_reader); - virtual ~AudioCapturerLinux(); + ~AudioCapturerLinux() override; // AudioCapturer interface. - virtual bool Start(const PacketCapturedCallback& callback) override; - virtual void Stop() override; - virtual bool IsStarted() override; + bool Start(const PacketCapturedCallback& callback) override; + void Stop() override; + bool IsStarted() override; // AudioPipeReader::StreamObserver interface. - virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) override; + void OnDataRead(scoped_refptr<base::RefCountedString> data) override; private: scoped_refptr<AudioPipeReader> pipe_reader_; diff --git a/remoting/host/chromoting_host_unittest.cc b/remoting/host/chromoting_host_unittest.cc index 51bdd43..84b4f7d 100644 --- a/remoting/host/chromoting_host_unittest.cc +++ b/remoting/host/chromoting_host_unittest.cc @@ -70,7 +70,7 @@ class ChromotingHostTest : public testing::Test { ChromotingHostTest() { } - virtual void SetUp() override { + void SetUp() override { task_runner_ = new AutoThreadTaskRunner( message_loop_.message_loop_proxy(), base::Bind(&ChromotingHostTest::QuitMainMessageLoop, @@ -225,7 +225,7 @@ class ChromotingHostTest : public testing::Test { host_->clients_.push_back(client.release()); } - virtual void TearDown() override { + void TearDown() override { // Make sure that the host has been properly deleted. DCHECK(host_.get() == NULL); } diff --git a/remoting/host/client_session_unittest.cc b/remoting/host/client_session_unittest.cc index 289a106..5bd4ca2 100644 --- a/remoting/host/client_session_unittest.cc +++ b/remoting/host/client_session_unittest.cc @@ -122,8 +122,8 @@ class ClientSessionTest : public testing::Test { public: ClientSessionTest() : client_jid_("user@domain/rest-of-jid") {} - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // Creates the client session. void CreateClientSession(); diff --git a/remoting/host/clipboard_x11.cc b/remoting/host/clipboard_x11.cc index dea6705..fa04639 100644 --- a/remoting/host/clipboard_x11.cc +++ b/remoting/host/clipboard_x11.cc @@ -20,18 +20,16 @@ class ClipboardX11 : public Clipboard, public base::MessageLoopForIO::Watcher { public: ClipboardX11(); - virtual ~ClipboardX11(); + ~ClipboardX11() override; // Clipboard interface. - virtual void Start( - scoped_ptr<protocol::ClipboardStub> client_clipboard) override; - virtual void InjectClipboardEvent( - const protocol::ClipboardEvent& event) override; - virtual void Stop() override; + void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override; + void InjectClipboardEvent(const protocol::ClipboardEvent& event) override; + void Stop() override; // MessageLoopForIO::Watcher interface. - virtual void OnFileCanReadWithoutBlocking(int fd) override; - virtual void OnFileCanWriteWithoutBlocking(int fd) override; + void OnFileCanReadWithoutBlocking(int fd) override; + void OnFileCanWriteWithoutBlocking(int fd) override; private: void OnClipboardChanged(const std::string& mime_type, diff --git a/remoting/host/config_file_watcher_unittest.cc b/remoting/host/config_file_watcher_unittest.cc index 8a3b95f..4b5cdc7 100644 --- a/remoting/host/config_file_watcher_unittest.cc +++ b/remoting/host/config_file_watcher_unittest.cc @@ -39,11 +39,11 @@ class ConfigFileWatcherDelegate : public ConfigFileWatcher::Delegate { class ConfigFileWatcherTest : public testing::Test { public: ConfigFileWatcherTest(); - virtual ~ConfigFileWatcherTest(); + ~ConfigFileWatcherTest() override; // testing::Test overrides - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // Stops the config file watcher. void StopWatcher(); diff --git a/remoting/host/continue_window_linux.cc b/remoting/host/continue_window_linux.cc index e3a8a60..668e392 100644 --- a/remoting/host/continue_window_linux.cc +++ b/remoting/host/continue_window_linux.cc @@ -17,12 +17,12 @@ namespace remoting { class ContinueWindowGtk : public ContinueWindow { public: ContinueWindowGtk(); - virtual ~ContinueWindowGtk(); + ~ContinueWindowGtk() override; protected: // ContinueWindow overrides. - virtual void ShowUi() override; - virtual void HideUi() override; + void ShowUi() override; + void HideUi() override; private: void CreateWindow(); diff --git a/remoting/host/curtain_mode_linux.cc b/remoting/host/curtain_mode_linux.cc index 407ddf6..696af4e 100644 --- a/remoting/host/curtain_mode_linux.cc +++ b/remoting/host/curtain_mode_linux.cc @@ -18,7 +18,7 @@ class CurtainModeLinux : public CurtainMode { CurtainModeLinux(); // Overriden from CurtainMode. - virtual bool Activate() override; + bool Activate() override; private: // Returns true if the host is running under an Xvfb session. diff --git a/remoting/host/daemon_process_unittest.cc b/remoting/host/daemon_process_unittest.cc index 51ca681..d1e464b 100644 --- a/remoting/host/daemon_process_unittest.cc +++ b/remoting/host/daemon_process_unittest.cc @@ -121,10 +121,10 @@ void MockDaemonProcess::SendToNetwork(IPC::Message* message) { class DaemonProcessTest : public testing::Test { public: DaemonProcessTest(); - virtual ~DaemonProcessTest(); + ~DaemonProcessTest() override; - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // DaemonProcess mocks DesktopSession* DoCreateDesktopSession(int terminal_id); diff --git a/remoting/host/desktop_process_unittest.cc b/remoting/host/desktop_process_unittest.cc index 39dc75b..47f76df 100644 --- a/remoting/host/desktop_process_unittest.cc +++ b/remoting/host/desktop_process_unittest.cc @@ -95,11 +95,11 @@ bool MockNetworkListener::OnMessageReceived(const IPC::Message& message) { class DesktopProcessTest : public testing::Test { public: DesktopProcessTest(); - virtual ~DesktopProcessTest(); + ~DesktopProcessTest() override; // testing::Test overrides - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // MockDaemonListener mocks void ConnectNetworkChannel(IPC::PlatformFileForTransit desktop_process); diff --git a/remoting/host/desktop_resizer_linux.cc b/remoting/host/desktop_resizer_linux.cc index f28c1c6..13ce6a7 100644 --- a/remoting/host/desktop_resizer_linux.cc +++ b/remoting/host/desktop_resizer_linux.cc @@ -124,14 +124,14 @@ class ScreenResources { class DesktopResizerLinux : public DesktopResizer { public: DesktopResizerLinux(); - virtual ~DesktopResizerLinux(); + ~DesktopResizerLinux() override; // DesktopResizer interface - virtual ScreenResolution GetCurrentResolution() override; - virtual std::list<ScreenResolution> GetSupportedResolutions( + ScreenResolution GetCurrentResolution() override; + std::list<ScreenResolution> GetSupportedResolutions( const ScreenResolution& preferred) override; - virtual void SetResolution(const ScreenResolution& resolution) override; - virtual void RestoreResolution(const ScreenResolution& original) override; + void SetResolution(const ScreenResolution& resolution) override; + void RestoreResolution(const ScreenResolution& original) override; private: // Create a mode, and attach it to the primary output. If the mode already diff --git a/remoting/host/disconnect_window_linux.cc b/remoting/host/disconnect_window_linux.cc index daae57a..5680e1d 100644 --- a/remoting/host/disconnect_window_linux.cc +++ b/remoting/host/disconnect_window_linux.cc @@ -22,11 +22,10 @@ namespace { class DisconnectWindowGtk : public HostWindow { public: DisconnectWindowGtk(); - virtual ~DisconnectWindowGtk(); + ~DisconnectWindowGtk() override; // HostWindow overrides. - virtual void Start( - const base::WeakPtr<ClientSessionControl>& client_session_control) + void Start(const base::WeakPtr<ClientSessionControl>& client_session_control) override; private: diff --git a/remoting/host/gnubby_auth_handler_posix_unittest.cc b/remoting/host/gnubby_auth_handler_posix_unittest.cc index 2a055ac..d3e522a 100644 --- a/remoting/host/gnubby_auth_handler_posix_unittest.cc +++ b/remoting/host/gnubby_auth_handler_posix_unittest.cc @@ -54,7 +54,7 @@ class GnubbyAuthHandlerPosixTest : public testing::Test { public: GnubbyAuthHandlerPosixTest() {} - virtual void SetUp() override; + void SetUp() override; protected: // Object under test. diff --git a/remoting/host/heartbeat_sender_unittest.cc b/remoting/host/heartbeat_sender_unittest.cc index fb8acee..2760cd4 100644 --- a/remoting/host/heartbeat_sender_unittest.cc +++ b/remoting/host/heartbeat_sender_unittest.cc @@ -65,7 +65,7 @@ ACTION_P(RemoveListener, list) { class HeartbeatSenderTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair); ASSERT_TRUE(key_pair_.get()); @@ -82,7 +82,7 @@ class HeartbeatSenderTest &mock_listener_, kHostId, &signal_strategy_, key_pair_, kTestBotJid)); } - virtual void TearDown() override { + void TearDown() override { heartbeat_sender_.reset(); EXPECT_TRUE(signal_strategy_listeners_.empty()); } diff --git a/remoting/host/host_change_notification_listener_unittest.cc b/remoting/host/host_change_notification_listener_unittest.cc index c04c836..ff9e15b 100644 --- a/remoting/host/host_change_notification_listener_unittest.cc +++ b/remoting/host/host_change_notification_listener_unittest.cc @@ -48,7 +48,7 @@ class HostChangeNotificationListenerTest : public testing::Test { MOCK_METHOD0(OnHostDeleted, void()); }; - virtual void SetUp() override { + void SetUp() override { EXPECT_CALL(signal_strategy_, AddListener(NotNull())) .WillRepeatedly(AddListener(&signal_strategy_listeners_)); EXPECT_CALL(signal_strategy_, RemoveListener(NotNull())) @@ -60,7 +60,7 @@ class HostChangeNotificationListenerTest : public testing::Test { &mock_listener_, kHostId, &signal_strategy_, kTestBotJid)); } - virtual void TearDown() override { + void TearDown() override { host_change_notification_listener_.reset(); EXPECT_TRUE(signal_strategy_listeners_.empty()); } diff --git a/remoting/host/host_extension_session_manager_unittest.cc b/remoting/host/host_extension_session_manager_unittest.cc index 7a3592e..25e18c4 100644 --- a/remoting/host/host_extension_session_manager_unittest.cc +++ b/remoting/host/host_extension_session_manager_unittest.cc @@ -24,7 +24,7 @@ class HostExtensionSessionManagerTest : public testing::Test { extensions_.push_back(&extension2_); extensions_.push_back(&extension3_); } - virtual ~HostExtensionSessionManagerTest() {} + ~HostExtensionSessionManagerTest() override {} protected: // Fake HostExtensions for testing. diff --git a/remoting/host/host_status_logger_unittest.cc b/remoting/host/host_status_logger_unittest.cc index d2b6fad..0ce904a 100644 --- a/remoting/host/host_status_logger_unittest.cc +++ b/remoting/host/host_status_logger_unittest.cc @@ -125,7 +125,7 @@ MATCHER(IsClientDisconnected, "") { class HostStatusLoggerTest : public testing::Test { public: HostStatusLoggerTest() {} - virtual void SetUp() override { + void SetUp() override { message_loop_proxy_ = base::MessageLoopProxy::current(); EXPECT_CALL(signal_strategy_, AddListener(_)); host_status_logger_.reset( diff --git a/remoting/host/host_status_sender_unittest.cc b/remoting/host/host_status_sender_unittest.cc index fe84401..abb66e7 100644 --- a/remoting/host/host_status_sender_unittest.cc +++ b/remoting/host/host_status_sender_unittest.cc @@ -41,7 +41,7 @@ const char kTestExitCodeString[] = "INVALID_HOST_CONFIGURATION"; class HostStatusSenderTest : public testing::Test { protected: - virtual void SetUp() override { + void SetUp() override { key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair); ASSERT_TRUE(key_pair_.get()); @@ -49,9 +49,7 @@ class HostStatusSenderTest kHostId, &signal_strategy_, key_pair_, kTestBotJid)); } - virtual void TearDown() override { - host_status_sender_.reset(); - } + void TearDown() override { host_status_sender_.reset(); } void ValidateHostStatusStanza(XmlElement* stanza, HostStatusSender::HostStatus status); diff --git a/remoting/host/input_injector_linux.cc b/remoting/host/input_injector_linux.cc index 81eda65..523c71d 100644 --- a/remoting/host/input_injector_linux.cc +++ b/remoting/host/input_injector_linux.cc @@ -92,21 +92,20 @@ class InputInjectorLinux : public InputInjector { public: explicit InputInjectorLinux( scoped_refptr<base::SingleThreadTaskRunner> task_runner); - virtual ~InputInjectorLinux(); + ~InputInjectorLinux() override; bool Init(); // Clipboard stub interface. - virtual void InjectClipboardEvent(const ClipboardEvent& event) override; + void InjectClipboardEvent(const ClipboardEvent& event) override; // InputStub interface. - virtual void InjectKeyEvent(const KeyEvent& event) override; - virtual void InjectTextEvent(const TextEvent& event) override; - virtual void InjectMouseEvent(const MouseEvent& event) override; + void InjectKeyEvent(const KeyEvent& event) override; + void InjectTextEvent(const TextEvent& event) override; + void InjectMouseEvent(const MouseEvent& event) override; // InputInjector interface. - virtual void Start( - scoped_ptr<protocol::ClipboardStub> client_clipboard) override; + void Start(scoped_ptr<protocol::ClipboardStub> client_clipboard) override; private: // The actual implementation resides in InputInjectorLinux::Core class. diff --git a/remoting/host/ipc_desktop_environment_unittest.cc b/remoting/host/ipc_desktop_environment_unittest.cc index e0865cc..403b109 100644 --- a/remoting/host/ipc_desktop_environment_unittest.cc +++ b/remoting/host/ipc_desktop_environment_unittest.cc @@ -121,9 +121,9 @@ bool MockDaemonListener::OnMessageReceived(const IPC::Message& message) { class IpcDesktopEnvironmentTest : public testing::Test { public: IpcDesktopEnvironmentTest(); - virtual ~IpcDesktopEnvironmentTest(); + ~IpcDesktopEnvironmentTest() override; - virtual void SetUp() override; + void SetUp() override; void ConnectTerminal(int terminal_id, const ScreenResolution& resolution, diff --git a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc index e0f98f2..89702b1 100644 --- a/remoting/host/it2me/it2me_native_messaging_host_unittest.cc +++ b/remoting/host/it2me/it2me_native_messaging_host_unittest.cc @@ -166,10 +166,10 @@ class MockIt2MeHostFactory : public It2MeHostFactory { class It2MeNativeMessagingHostTest : public testing::Test { public: It2MeNativeMessagingHostTest() {} - virtual ~It2MeNativeMessagingHostTest() {} + ~It2MeNativeMessagingHostTest() override {} - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; protected: scoped_ptr<base::DictionaryValue> ReadMessageFromOutputPipe(); diff --git a/remoting/host/linux/audio_pipe_reader.h b/remoting/host/linux/audio_pipe_reader.h index 949736c..c99d847 100644 --- a/remoting/host/linux/audio_pipe_reader.h +++ b/remoting/host/linux/audio_pipe_reader.h @@ -52,8 +52,8 @@ class AudioPipeReader void RemoveObserver(StreamObserver* observer); // MessageLoopForIO::Watcher interface. - virtual void OnFileCanReadWithoutBlocking(int fd) override; - virtual void OnFileCanWriteWithoutBlocking(int fd) override; + void OnFileCanReadWithoutBlocking(int fd) override; + void OnFileCanWriteWithoutBlocking(int fd) override; private: friend class base::DeleteHelper<AudioPipeReader>; @@ -62,7 +62,7 @@ class AudioPipeReader AudioPipeReader(scoped_refptr<base::SingleThreadTaskRunner> task_runner, const base::FilePath& pipe_path); - virtual ~AudioPipeReader(); + ~AudioPipeReader() override; void StartOnAudioThread(); void OnDirectoryChanged(const base::FilePath& path, bool error); diff --git a/remoting/host/linux/audio_pipe_reader_unittest.cc b/remoting/host/linux/audio_pipe_reader_unittest.cc index 69913bf..0974f74 100644 --- a/remoting/host/linux/audio_pipe_reader_unittest.cc +++ b/remoting/host/linux/audio_pipe_reader_unittest.cc @@ -25,7 +25,7 @@ class AudioPipeReaderTest : public testing::Test, : stop_at_position_(-1) { } - virtual void SetUp() override { + void SetUp() override { ASSERT_TRUE(test_dir_.CreateUniqueTempDir()); pipe_path_ = test_dir_.path().AppendASCII("test_pipe"); audio_thread_.reset(new base::Thread("TestAudioThread")); @@ -37,7 +37,7 @@ class AudioPipeReaderTest : public testing::Test, } // AudioPipeReader::StreamObserver interface. - virtual void OnDataRead(scoped_refptr<base::RefCountedString> data) override { + void OnDataRead(scoped_refptr<base::RefCountedString> data) override { read_data_ += data->data(); if (stop_at_position_ > 0 && static_cast<int>(read_data_.size()) >= stop_at_position_) { diff --git a/remoting/host/linux/x_server_clipboard_unittest.cc b/remoting/host/linux/x_server_clipboard_unittest.cc index 57ca4157..ea52a07 100644 --- a/remoting/host/linux/x_server_clipboard_unittest.cc +++ b/remoting/host/linux/x_server_clipboard_unittest.cc @@ -67,7 +67,7 @@ class ClipboardTestClient { class XServerClipboardTest : public testing::Test { public: - virtual void SetUp() override { + void SetUp() override { // XSynchronize() ensures that PumpXEvents() fully processes all X server // requests and responses before returning to the caller. Display* display1 = XOpenDisplay(NULL); @@ -78,7 +78,7 @@ class XServerClipboardTest : public testing::Test { client2_.Init(display2); } - virtual void TearDown() override { + void TearDown() override { XCloseDisplay(client1_.display()); XCloseDisplay(client2_.display()); } diff --git a/remoting/host/local_input_monitor_linux.cc b/remoting/host/local_input_monitor_linux.cc index da38872..b0493dd 100644 --- a/remoting/host/local_input_monitor_linux.cc +++ b/remoting/host/local_input_monitor_linux.cc @@ -39,7 +39,7 @@ class LocalInputMonitorLinux : public base::NonThreadSafe, scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner, scoped_refptr<base::SingleThreadTaskRunner> input_task_runner, base::WeakPtr<ClientSessionControl> client_session_control); - virtual ~LocalInputMonitorLinux(); + ~LocalInputMonitorLinux() override; private: // The actual implementation resides in LocalInputMonitorLinux::Core class. @@ -56,14 +56,14 @@ class LocalInputMonitorLinux : public base::NonThreadSafe, private: friend class base::RefCountedThreadSafe<Core>; - virtual ~Core(); + ~Core() override; void StartOnInputThread(); void StopOnInputThread(); // base::MessagePumpLibevent::Watcher interface. - virtual void OnFileCanReadWithoutBlocking(int fd) override; - virtual void OnFileCanWriteWithoutBlocking(int fd) override; + void OnFileCanReadWithoutBlocking(int fd) override; + void OnFileCanWriteWithoutBlocking(int fd) override; // Processes key and mouse events. void ProcessXEvent(xEvent* event); diff --git a/remoting/host/local_input_monitor_unittest.cc b/remoting/host/local_input_monitor_unittest.cc index df21b93..335e220 100644 --- a/remoting/host/local_input_monitor_unittest.cc +++ b/remoting/host/local_input_monitor_unittest.cc @@ -36,7 +36,7 @@ class LocalInputMonitorTest : public testing::Test { public: LocalInputMonitorTest(); - virtual void SetUp() override; + void SetUp() override; base::MessageLoop message_loop_; base::RunLoop run_loop_; diff --git a/remoting/host/native_messaging/native_messaging_reader_unittest.cc b/remoting/host/native_messaging/native_messaging_reader_unittest.cc index 9611c11..38728b1 100644 --- a/remoting/host/native_messaging/native_messaging_reader_unittest.cc +++ b/remoting/host/native_messaging/native_messaging_reader_unittest.cc @@ -18,9 +18,9 @@ namespace remoting { class NativeMessagingReaderTest : public testing::Test { public: NativeMessagingReaderTest(); - virtual ~NativeMessagingReaderTest(); + ~NativeMessagingReaderTest() override; - virtual void SetUp() override; + void SetUp() override; // Starts the reader and runs the MessageLoop to completion. void Run(); diff --git a/remoting/host/native_messaging/native_messaging_writer_unittest.cc b/remoting/host/native_messaging/native_messaging_writer_unittest.cc index da9be71..38817fd 100644 --- a/remoting/host/native_messaging/native_messaging_writer_unittest.cc +++ b/remoting/host/native_messaging/native_messaging_writer_unittest.cc @@ -17,9 +17,9 @@ namespace remoting { class NativeMessagingWriterTest : public testing::Test { public: NativeMessagingWriterTest(); - virtual ~NativeMessagingWriterTest(); + ~NativeMessagingWriterTest() override; - virtual void SetUp() override; + void SetUp() override; protected: scoped_ptr<NativeMessagingWriter> writer_; diff --git a/remoting/host/pairing_registry_delegate_linux.h b/remoting/host/pairing_registry_delegate_linux.h index 293b28f..ad342eb 100644 --- a/remoting/host/pairing_registry_delegate_linux.h +++ b/remoting/host/pairing_registry_delegate_linux.h @@ -19,15 +19,15 @@ class PairingRegistryDelegateLinux : public protocol::PairingRegistry::Delegate { public: PairingRegistryDelegateLinux(); - virtual ~PairingRegistryDelegateLinux(); + ~PairingRegistryDelegateLinux() override; // PairingRegistry::Delegate interface - virtual scoped_ptr<base::ListValue> LoadAll() override; - virtual bool DeleteAll() override; - virtual protocol::PairingRegistry::Pairing Load( + scoped_ptr<base::ListValue> LoadAll() override; + bool DeleteAll() override; + protocol::PairingRegistry::Pairing Load( const std::string& client_id) override; - virtual bool Save(const protocol::PairingRegistry::Pairing& pairing) override; - virtual bool Delete(const std::string& client_id) override; + bool Save(const protocol::PairingRegistry::Pairing& pairing) override; + bool Delete(const std::string& client_id) override; private: FRIEND_TEST_ALL_PREFIXES(PairingRegistryDelegateLinuxTest, SaveAndLoad); diff --git a/remoting/host/pairing_registry_delegate_linux_unittest.cc b/remoting/host/pairing_registry_delegate_linux_unittest.cc index 5b7f4ab..c1c3b37 100644 --- a/remoting/host/pairing_registry_delegate_linux_unittest.cc +++ b/remoting/host/pairing_registry_delegate_linux_unittest.cc @@ -15,7 +15,7 @@ using protocol::PairingRegistry; class PairingRegistryDelegateLinuxTest : public testing::Test { public: - virtual void SetUp() override { + void SetUp() override { // Create a temporary directory in order to get a unique name and use a // subdirectory to ensure that PairingRegistryDelegateLinux::Save() creates // the parent directory if it doesn't exist. @@ -23,9 +23,7 @@ class PairingRegistryDelegateLinuxTest : public testing::Test { temp_registry_ = temp_dir_.Append("paired-clients"); } - virtual void TearDown() override { - base::DeleteFile(temp_dir_, true); - } + void TearDown() override { base::DeleteFile(temp_dir_, true); } protected: base::FilePath temp_dir_; diff --git a/remoting/host/policy_hack/policy_watcher_linux.cc b/remoting/host/policy_hack/policy_watcher_linux.cc index d67b49b..f4096b8 100644 --- a/remoting/host/policy_hack/policy_watcher_linux.cc +++ b/remoting/host/policy_hack/policy_watcher_linux.cc @@ -54,10 +54,10 @@ class PolicyWatcherLinux : public PolicyWatcher { weak_factory_(this) { } - virtual ~PolicyWatcherLinux() {} + ~PolicyWatcherLinux() override {} protected: - virtual void StartWatchingInternal() override { + void StartWatchingInternal() override { DCHECK(OnPolicyWatcherThread()); watcher_.reset(new base::FilePathWatcher()); @@ -77,7 +77,7 @@ class PolicyWatcherLinux : public PolicyWatcher { ScheduleFallbackReloadTask(); } - virtual void StopWatchingInternal() override { + void StopWatchingInternal() override { DCHECK(OnPolicyWatcherThread()); // Stop watching for changes to files in the policies directory. @@ -162,7 +162,7 @@ class PolicyWatcherLinux : public PolicyWatcher { return policy.Pass(); } - virtual void Reload() override { + void Reload() override { DCHECK(OnPolicyWatcherThread()); // Check the directory time in order to see whether a reload is required. base::TimeDelta delay; diff --git a/remoting/host/policy_hack/policy_watcher_unittest.cc b/remoting/host/policy_hack/policy_watcher_unittest.cc index b19d92f..5cae57b 100644 --- a/remoting/host/policy_hack/policy_watcher_unittest.cc +++ b/remoting/host/policy_hack/policy_watcher_unittest.cc @@ -22,7 +22,7 @@ class PolicyWatcherTest : public testing::Test { PolicyWatcherTest() { } - virtual void SetUp() override { + void SetUp() override { message_loop_proxy_ = base::MessageLoopProxy::current(); policy_callback_ = base::Bind(&MockPolicyCallback::OnPolicyUpdate, base::Unretained(&mock_policy_callback_)); diff --git a/remoting/host/register_support_host_request_unittest.cc b/remoting/host/register_support_host_request_unittest.cc index 7f502c9..391d808 100644 --- a/remoting/host/register_support_host_request_unittest.cc +++ b/remoting/host/register_support_host_request_unittest.cc @@ -57,7 +57,7 @@ class MockCallback { class RegisterSupportHostRequestTest : public testing::Test { public: protected: - virtual void SetUp() { + void SetUp() override { key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair); ASSERT_TRUE(key_pair_.get()); diff --git a/remoting/host/setup/daemon_controller_delegate_linux.h b/remoting/host/setup/daemon_controller_delegate_linux.h index 145318c..916072c 100644 --- a/remoting/host/setup/daemon_controller_delegate_linux.h +++ b/remoting/host/setup/daemon_controller_delegate_linux.h @@ -13,24 +13,22 @@ namespace remoting { class DaemonControllerDelegateLinux : public DaemonController::Delegate { public: DaemonControllerDelegateLinux(); - virtual ~DaemonControllerDelegateLinux(); + ~DaemonControllerDelegateLinux() override; // DaemonController::Delegate interface. - virtual DaemonController::State GetState() override; - virtual scoped_ptr<base::DictionaryValue> GetConfig() override; - virtual void InstallHost( - const DaemonController::CompletionCallback& done) override; - virtual void SetConfigAndStart( + DaemonController::State GetState() override; + scoped_ptr<base::DictionaryValue> GetConfig() override; + void InstallHost(const DaemonController::CompletionCallback& done) override; + void SetConfigAndStart( scoped_ptr<base::DictionaryValue> config, bool consent, const DaemonController::CompletionCallback& done) override; - virtual void UpdateConfig( - scoped_ptr<base::DictionaryValue> config, - const DaemonController::CompletionCallback& done) override; - virtual void Stop(const DaemonController::CompletionCallback& done) override; - virtual void SetWindow(void* window_handle) override; - virtual std::string GetVersion() override; - virtual DaemonController::UsageStatsConsent GetUsageStatsConsent() override; + void UpdateConfig(scoped_ptr<base::DictionaryValue> config, + const DaemonController::CompletionCallback& done) override; + void Stop(const DaemonController::CompletionCallback& done) override; + void SetWindow(void* window_handle) override; + std::string GetVersion() override; + DaemonController::UsageStatsConsent GetUsageStatsConsent() override; private: DISALLOW_COPY_AND_ASSIGN(DaemonControllerDelegateLinux); diff --git a/remoting/host/setup/me2me_native_messaging_host_unittest.cc b/remoting/host/setup/me2me_native_messaging_host_unittest.cc index e525799..88f0bdb 100644 --- a/remoting/host/setup/me2me_native_messaging_host_unittest.cc +++ b/remoting/host/setup/me2me_native_messaging_host_unittest.cc @@ -222,10 +222,10 @@ MockDaemonControllerDelegate::GetUsageStatsConsent() { class Me2MeNativeMessagingHostTest : public testing::Test { public: Me2MeNativeMessagingHostTest(); - virtual ~Me2MeNativeMessagingHostTest(); + ~Me2MeNativeMessagingHostTest() override; - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; scoped_ptr<base::DictionaryValue> ReadMessageFromOutputPipe(); diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc index e884984..bfbed9f 100644 --- a/remoting/host/token_validator_factory_impl_unittest.cc +++ b/remoting/host/token_validator_factory_impl_unittest.cc @@ -88,7 +88,7 @@ class TokenValidatorFactoryImplTest : public testing::Test { } protected: - virtual void SetUp() override { + void SetUp() override { key_pair_ = RsaKeyPair::FromString(kTestRsaKeyPair); scoped_ptr<net::TestURLRequestContext> context( new SetResponseURLRequestContext()); diff --git a/remoting/host/video_frame_recorder_unittest.cc b/remoting/host/video_frame_recorder_unittest.cc index f4ea260..ac00e45 100644 --- a/remoting/host/video_frame_recorder_unittest.cc +++ b/remoting/host/video_frame_recorder_unittest.cc @@ -52,8 +52,8 @@ class VideoFrameRecorderTest : public testing::Test { public: VideoFrameRecorderTest(); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; // Creates a new VideoEncoder, wraps it using |recorder_|, and stores the // newly wrapped encoder in |encoder_|. diff --git a/remoting/host/video_scheduler_unittest.cc b/remoting/host/video_scheduler_unittest.cc index 3db994c..2e447c1 100644 --- a/remoting/host/video_scheduler_unittest.cc +++ b/remoting/host/video_scheduler_unittest.cc @@ -127,8 +127,8 @@ class VideoSchedulerTest : public testing::Test { public: VideoSchedulerTest(); - virtual void SetUp() override; - virtual void TearDown() override; + void SetUp() override; + void TearDown() override; void StartVideoScheduler( scoped_ptr<webrtc::DesktopCapturer> capturer, diff --git a/remoting/protocol/authenticator_test_base.h b/remoting/protocol/authenticator_test_base.h index f8b7e25..02e7de9 100644 --- a/remoting/protocol/authenticator_test_base.h +++ b/remoting/protocol/authenticator_test_base.h @@ -29,7 +29,7 @@ class FakeStreamSocket; class AuthenticatorTestBase : public testing::Test { public: AuthenticatorTestBase(); - virtual ~AuthenticatorTestBase(); + ~AuthenticatorTestBase() override; protected: class MockChannelDoneCallback { @@ -43,7 +43,7 @@ class AuthenticatorTestBase : public testing::Test { Authenticator* receiver, bool sender_started, bool receiver_srated); - virtual void SetUp() override; + void SetUp() override; void RunAuthExchange(); void RunHostInitiatedAuthExchange(); void RunChannelAuth(bool expected_fail); diff --git a/remoting/protocol/buffered_socket_writer_unittest.cc b/remoting/protocol/buffered_socket_writer_unittest.cc index 1cac2229..f257c8f 100644 --- a/remoting/protocol/buffered_socket_writer_unittest.cc +++ b/remoting/protocol/buffered_socket_writer_unittest.cc @@ -47,7 +47,7 @@ class BufferedSocketWriterTest : public testing::Test { } protected: - virtual void SetUp() override { + void SetUp() override { socket_.reset(new FakeStreamSocket()); writer_.reset(new BufferedSocketWriter()); writer_->Init(socket_.get(), base::Bind( diff --git a/remoting/protocol/channel_multiplexer_unittest.cc b/remoting/protocol/channel_multiplexer_unittest.cc index 51370f1..37b7e89 100644 --- a/remoting/protocol/channel_multiplexer_unittest.cc +++ b/remoting/protocol/channel_multiplexer_unittest.cc @@ -70,7 +70,7 @@ class ChannelMultiplexerTest : public testing::Test { } protected: - virtual void SetUp() override { + void SetUp() override { // Create pair of multiplexers and connect them to each other. host_mux_.reset(new ChannelMultiplexer( host_session_.GetTransportChannelFactory(), kMuxChannelName)); diff --git a/remoting/protocol/chromium_socket_factory_unittest.cc b/remoting/protocol/chromium_socket_factory_unittest.cc index b68d25c..7f66775 100644 --- a/remoting/protocol/chromium_socket_factory_unittest.cc +++ b/remoting/protocol/chromium_socket_factory_unittest.cc @@ -17,7 +17,7 @@ namespace protocol { class ChromiumSocketFactoryTest : public testing::Test, public sigslot::has_slots<> { public: - virtual void SetUp() override { + void SetUp() override { socket_factory_.reset(new ChromiumPacketSocketFactory()); socket_.reset(socket_factory_->CreateUdpSocket( diff --git a/remoting/protocol/connection_to_client_unittest.cc b/remoting/protocol/connection_to_client_unittest.cc index ded0197..e123cfa 100644 --- a/remoting/protocol/connection_to_client_unittest.cc +++ b/remoting/protocol/connection_to_client_unittest.cc @@ -26,7 +26,7 @@ class ConnectionToClientTest : public testing::Test { } protected: - virtual void SetUp() override { + void SetUp() override { session_ = new FakeSession(); // Allocate a ClientConnection object with the mock objects. @@ -42,7 +42,7 @@ class ConnectionToClientTest : public testing::Test { base::RunLoop().RunUntilIdle(); } - virtual void TearDown() override { + void TearDown() override { viewer_.reset(); base::RunLoop().RunUntilIdle(); } diff --git a/remoting/protocol/jingle_session_unittest.cc b/remoting/protocol/jingle_session_unittest.cc index f27b3f9..c92448a 100644 --- a/remoting/protocol/jingle_session_unittest.cc +++ b/remoting/protocol/jingle_session_unittest.cc @@ -123,10 +123,9 @@ class JingleSessionTest : public testing::Test { } protected: - virtual void SetUp() { - } + void SetUp() override {} - virtual void TearDown() { + void TearDown() override { CloseSessions(); CloseSessionManager(); base::RunLoop().RunUntilIdle(); diff --git a/remoting/protocol/message_reader_unittest.cc b/remoting/protocol/message_reader_unittest.cc index cb60368..5c43788 100644 --- a/remoting/protocol/message_reader_unittest.cc +++ b/remoting/protocol/message_reader_unittest.cc @@ -67,13 +67,9 @@ class MessageReaderTest : public testing::Test { } protected: - virtual void SetUp() override { - reader_.reset(new MessageReader()); - } + void SetUp() override { reader_.reset(new MessageReader()); } - virtual void TearDown() override { - STLDeleteElements(&messages_); - } + void TearDown() override { STLDeleteElements(&messages_); } void InitReader() { reader_->Init(&socket_, base::Bind( diff --git a/remoting/protocol/negotiating_authenticator_unittest.cc b/remoting/protocol/negotiating_authenticator_unittest.cc index 5dbc211..82e3fc4 100644 --- a/remoting/protocol/negotiating_authenticator_unittest.cc +++ b/remoting/protocol/negotiating_authenticator_unittest.cc @@ -46,8 +46,7 @@ class NegotiatingAuthenticatorTest : public AuthenticatorTestBase { public: NegotiatingAuthenticatorTest() { } - virtual ~NegotiatingAuthenticatorTest() { - } + ~NegotiatingAuthenticatorTest() override {} protected: void InitAuthenticators( diff --git a/remoting/protocol/pairing_registry_unittest.cc b/remoting/protocol/pairing_registry_unittest.cc index 38db5db..f0aa251 100644 --- a/remoting/protocol/pairing_registry_unittest.cc +++ b/remoting/protocol/pairing_registry_unittest.cc @@ -62,9 +62,7 @@ namespace protocol { class PairingRegistryTest : public testing::Test { public: - virtual void SetUp() override { - callback_count_ = 0; - } + void SetUp() override { callback_count_ = 0; } void set_pairings(scoped_ptr<base::ListValue> pairings) { pairings_ = pairings.Pass(); diff --git a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc index 2f87cd4..26a5844 100644 --- a/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc +++ b/remoting/protocol/ssl_hmac_channel_authenticator_unittest.cc @@ -51,10 +51,10 @@ ACTION_P(QuitThreadOnCounter, counter) { class SslHmacChannelAuthenticatorTest : public testing::Test { public: SslHmacChannelAuthenticatorTest() {} - virtual ~SslHmacChannelAuthenticatorTest() {} + ~SslHmacChannelAuthenticatorTest() override {} protected: - virtual void SetUp() override { + void SetUp() override { base::FilePath certs_dir(net::GetTestCertsDirectory()); base::FilePath cert_path = certs_dir.AppendASCII("unittest.selfsigned.der"); diff --git a/remoting/protocol/third_party_authenticator_unittest.cc b/remoting/protocol/third_party_authenticator_unittest.cc index f14484f..770907d 100644 --- a/remoting/protocol/third_party_authenticator_unittest.cc +++ b/remoting/protocol/third_party_authenticator_unittest.cc @@ -96,7 +96,7 @@ class ThirdPartyAuthenticatorTest : public AuthenticatorTestBase { public: ThirdPartyAuthenticatorTest() {} - virtual ~ThirdPartyAuthenticatorTest() {} + ~ThirdPartyAuthenticatorTest() override {} protected: void InitAuthenticators() { diff --git a/remoting/protocol/v2_authenticator_unittest.cc b/remoting/protocol/v2_authenticator_unittest.cc index 1f765dd..e9eac66 100644 --- a/remoting/protocol/v2_authenticator_unittest.cc +++ b/remoting/protocol/v2_authenticator_unittest.cc @@ -35,8 +35,7 @@ class V2AuthenticatorTest : public AuthenticatorTestBase { public: V2AuthenticatorTest() { } - virtual ~V2AuthenticatorTest() { - } + ~V2AuthenticatorTest() override {} protected: void InitAuthenticators(const std::string& client_secret, diff --git a/remoting/signaling/log_to_server_unittest.cc b/remoting/signaling/log_to_server_unittest.cc index 0c9c78c..494d307 100644 --- a/remoting/signaling/log_to_server_unittest.cc +++ b/remoting/signaling/log_to_server_unittest.cc @@ -39,7 +39,7 @@ MATCHER_P2(IsLogEntry, key, value, "") { class LogToServerTest : public testing::Test { public: LogToServerTest() {} - virtual void SetUp() override { + void SetUp() override { EXPECT_CALL(signal_strategy_, AddListener(_)); EXPECT_CALL(signal_strategy_, RemoveListener(_)); log_to_server_.reset( |