Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7)

Unified Diff: extensions/browser/api/cast_channel/cast_socket_unittest.cc

Issue 664933004: Standardize usage of virtual/override/final in extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: extensions/browser/api/cast_channel/cast_socket_unittest.cc
diff --git a/extensions/browser/api/cast_channel/cast_socket_unittest.cc b/extensions/browser/api/cast_channel/cast_socket_unittest.cc
index 505195793e89a825c80b0576e07d2cbd94fb8f24..f31a98a6aecf8d746ac7a6e32e8aa2f5f8b874a5 100644
--- a/extensions/browser/api/cast_channel/cast_socket_unittest.cc
+++ b/extensions/browser/api/cast_channel/cast_socket_unittest.cc
@@ -204,7 +204,7 @@ class TestCastSocket : public CastSocket {
return msg.length() - MessageFramer::MessageHeader::header_size();
}
- virtual ~TestCastSocket() {}
+ ~TestCastSocket() override {}
// Helpers to set mock results for various operations.
void SetupTcp1Connect(net::IoMode mode, int result) {
@@ -284,7 +284,7 @@ class TestCastSocket : public CastSocket {
void DisallowVerifyChallengeResult() { verify_challenge_disallow_ = true; }
private:
- virtual scoped_ptr<net::TCPClientSocket> CreateTcpSocket() override {
+ scoped_ptr<net::TCPClientSocket> CreateTcpSocket() override {
if (tcp_unresponsive_) {
return scoped_ptr<net::TCPClientSocket>(new MockTCPSocket(true));
} else {
@@ -294,7 +294,7 @@ class TestCastSocket : public CastSocket {
}
}
- virtual scoped_ptr<net::SSLClientSocket> CreateSslSocket(
+ scoped_ptr<net::SSLClientSocket> CreateSslSocket(
scoped_ptr<net::StreamSocket> socket) override {
net::MockConnect* connect_data = ssl_connect_data_[connect_index_].get();
connect_data->peer_addr = ip_;
@@ -309,20 +309,18 @@ class TestCastSocket : public CastSocket {
net::AddressList(), &capturing_net_log_, ssl_data_.get()));
}
- virtual bool ExtractPeerCert(std::string* cert) override {
+ bool ExtractPeerCert(std::string* cert) override {
if (extract_cert_result_)
cert->assign("dummy_test_cert");
return extract_cert_result_;
}
- virtual bool VerifyChallengeReply() override {
+ bool VerifyChallengeReply() override {
EXPECT_FALSE(verify_challenge_disallow_);
return verify_challenge_result_;
}
- virtual base::Timer* GetTimer() override {
- return mock_timer_.get();
- }
+ base::Timer* GetTimer() override { return mock_timer_.get(); }
net::CapturingNetLog capturing_net_log_;
net::IPEndPoint ip_;
« no previous file with comments | « extensions/browser/api/cast_channel/cast_socket.h ('k') | extensions/browser/api/copresence_socket/copresence_socket_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698