Run clang-tidy modernize-use-equals-{delete,default} on //net/websockets

See the bugs and cxx post for justification and details: https://groups.google.com/a/chromium.org/forum/#!topic/cxx/RkOHzIK6Tq8 This change was done using clang-tidy as described here: https://chromium.googlesource.com/chromium/src/+/lkcr/docs/clang_tidy.md In some cases the the tool leaves behind a string of commas where it replaced a member initializer list (https://bugs.llvm.org/show_bug.cgi?id=35051). They were cleaned up with: git diff --name-only | \ xargs sed -E -i 's/(^\s*|\)\s*):[ ,]*= default/\1 = default/' BUG=778959,778957 This CL was uploaded by git cl split. R=yhirano@chromium.org Change-Id: I702f4d49f1d35ec98595a2eeaa5865b3cb4584df Reviewed-on: https://chromium-review.googlesource.com/799597 Reviewed-by: Yutaka Hirano <yhirano@chromium.org> Commit-Queue: Chris Watkins <watk@chromium.org> Cr-Commit-Position: refs/heads/master@{#520457}
marcosholgado · Nov 30, 2017 · 28c2fdd · 28c2fdd
1 parent b5dec6f
commit 28c2fdd
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 37 deletions.
diff --git a/net/websockets/websocket_basic_handshake_stream.cc b/net/websockets/websocket_basic_handshake_stream.cc
@@ -307,7 +307,7 @@ WebSocketBasicHandshakeStream::WebSocketBasicHandshakeStream(
   DCHECK(request);
 }
 
-WebSocketBasicHandshakeStream::~WebSocketBasicHandshakeStream() {}
+WebSocketBasicHandshakeStream::~WebSocketBasicHandshakeStream() = default;
 
 int WebSocketBasicHandshakeStream::InitializeStream(
     const HttpRequestInfo* request_info,

diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
@@ -133,7 +133,7 @@ class DependentIOBuffer : public WrappedIOBuffer {
       : WrappedIOBuffer(buffer->data() + offset), buffer_(std::move(buffer)) {}
 
  private:
-  ~DependentIOBuffer() override {}
+  ~DependentIOBuffer() override = default;
   scoped_refptr<net::IOBuffer> buffer_;
 };
 
@@ -304,7 +304,8 @@ WebSocketChannel::HandshakeNotificationSender::HandshakeNotificationSender(
     WebSocketChannel* channel)
     : owner_(channel) {}
 
-WebSocketChannel::HandshakeNotificationSender::~HandshakeNotificationSender() {}
+WebSocketChannel::HandshakeNotificationSender::~HandshakeNotificationSender() =
+    default;
 
 void WebSocketChannel::HandshakeNotificationSender::Send(
     base::WeakPtr<HandshakeNotificationSender> sender) {

diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
@@ -155,7 +155,7 @@ typedef StrictMock< MockFunction<void(int)> > Checkpoint;  // NOLINT
 // This mock is for testing expectations about how the EventInterface is used.
 class MockWebSocketEventInterface : public WebSocketEventInterface {
  public:
-  MockWebSocketEventInterface() {}
+  MockWebSocketEventInterface() = default;
 
   ChannelState OnDataFrame(bool fin,
                            WebSocketMessageType type,
@@ -255,7 +255,7 @@ class FakeWebSocketEventInterface : public WebSocketEventInterface {
 class FakeWebSocketStream : public WebSocketStream {
  public:
   // Constructs with empty protocol and extensions.
-  FakeWebSocketStream() {}
+  FakeWebSocketStream() = default;
 
   // Constructs with specified protocol and extensions.
   FakeWebSocketStream(const std::string& protocol,
@@ -3416,7 +3416,7 @@ TEST_F(WebSocketChannelStreamTest, ProtocolError) {
 // Set the closing handshake timeout to a very tiny value before connecting.
 class WebSocketChannelStreamTimeoutTest : public WebSocketChannelStreamTest {
  protected:
-  WebSocketChannelStreamTimeoutTest() {}
+  WebSocketChannelStreamTimeoutTest() = default;
 
   void CreateChannelAndConnectSuccessfully() override {
     set_stream(std::move(mock_stream_));

diff --git a/net/websockets/websocket_deflate_stream.cc b/net/websockets/websocket_deflate_stream.cc
@@ -60,7 +60,7 @@ WebSocketDeflateStream::WebSocketDeflateStream(
   inflater_.Initialize(kWindowBits);
 }
 
-WebSocketDeflateStream::~WebSocketDeflateStream() {}
+WebSocketDeflateStream::~WebSocketDeflateStream() = default;
 
 int WebSocketDeflateStream::ReadFrames(
     std::vector<std::unique_ptr<WebSocketFrame>>* frames,

diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
@@ -228,7 +228,7 @@ class WebSocketDeflateStreamTest : public ::testing::Test {
   WebSocketDeflateStreamTest()
       : mock_stream_(NULL),
         predictor_(NULL) {}
-  ~WebSocketDeflateStreamTest() override {}
+  ~WebSocketDeflateStreamTest() override = default;
 
   void SetUp() override {
     Initialize(WebSocketDeflater::TAKE_OVER_CONTEXT, kWindowBits);
@@ -263,8 +263,8 @@ class WebSocketDeflateStreamTest : public ::testing::Test {
 class WebSocketDeflateStreamWithDoNotTakeOverContextTest
     : public WebSocketDeflateStreamTest {
  public:
-  WebSocketDeflateStreamWithDoNotTakeOverContextTest() {}
-  ~WebSocketDeflateStreamWithDoNotTakeOverContextTest() override {}
+  WebSocketDeflateStreamWithDoNotTakeOverContextTest() = default;
+  ~WebSocketDeflateStreamWithDoNotTakeOverContextTest() override = default;
 
   void SetUp() override {
     Initialize(WebSocketDeflater::DO_NOT_TAKE_OVER_CONTEXT, kWindowBits);
@@ -274,8 +274,8 @@ class WebSocketDeflateStreamWithDoNotTakeOverContextTest
 class WebSocketDeflateStreamWithClientWindowBitsTest
     : public WebSocketDeflateStreamTest {
  public:
-  WebSocketDeflateStreamWithClientWindowBitsTest() {}
-  ~WebSocketDeflateStreamWithClientWindowBitsTest() override {}
+  WebSocketDeflateStreamWithClientWindowBitsTest() = default;
+  ~WebSocketDeflateStreamWithClientWindowBitsTest() override = default;
 
   // Overridden to postpone the call to Initialize().
   void SetUp() override {}

diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
@@ -207,7 +207,7 @@ void ConnectTestingEventInterface::QuitNestedEventLoop() {
 // OnResolveProxy callback and records the information passed to it.
 class TestProxyDelegateWithProxyInfo : public ProxyDelegate {
  public:
-  TestProxyDelegateWithProxyInfo() {}
+  TestProxyDelegateWithProxyInfo() = default;
 
   struct ResolvedProxyInfo {
     GURL url;

diff --git a/net/websockets/websocket_extension.cc b/net/websockets/websocket_extension.cc
@@ -28,15 +28,15 @@ bool WebSocketExtension::Parameter::Equals(const Parameter& other) const {
   return name_ == other.name_ && value_ == other.value_;
 }
 
-WebSocketExtension::WebSocketExtension() {}
+WebSocketExtension::WebSocketExtension() = default;
 
 WebSocketExtension::WebSocketExtension(const std::string& name)
     : name_(name) {}
 
 WebSocketExtension::WebSocketExtension(const WebSocketExtension& other) =
     default;
 
-WebSocketExtension::~WebSocketExtension() {}
+WebSocketExtension::~WebSocketExtension() = default;
 
 bool WebSocketExtension::Equals(const WebSocketExtension& other) const {
   if (name_ != other.name_) return false;

diff --git a/net/websockets/websocket_extension_parser.cc b/net/websockets/websocket_extension_parser.cc
@@ -9,9 +9,9 @@
 
 namespace net {
 
-WebSocketExtensionParser::WebSocketExtensionParser() {}
+WebSocketExtensionParser::WebSocketExtensionParser() = default;
 
-WebSocketExtensionParser::~WebSocketExtensionParser() {}
+WebSocketExtensionParser::~WebSocketExtensionParser() = default;
 
 bool WebSocketExtensionParser::Parse(const char* data, size_t size) {
   current_ = data;

diff --git a/net/websockets/websocket_frame.cc b/net/websockets/websocket_frame.cc
@@ -78,11 +78,11 @@ void WebSocketFrameHeader::CopyFrom(const WebSocketFrameHeader& source) {
 WebSocketFrame::WebSocketFrame(WebSocketFrameHeader::OpCode opcode)
     : header(opcode) {}
 
-WebSocketFrame::~WebSocketFrame() {}
+WebSocketFrame::~WebSocketFrame() = default;
 
 WebSocketFrameChunk::WebSocketFrameChunk() : final_chunk(false) {}
 
-WebSocketFrameChunk::~WebSocketFrameChunk() {}
+WebSocketFrameChunk::~WebSocketFrameChunk() = default;
 
 int GetWebSocketFrameHeaderSize(const WebSocketFrameHeader& header) {
   int extended_length_size = 0;

diff --git a/net/websockets/websocket_frame_parser.cc b/net/websockets/websocket_frame_parser.cc
@@ -42,7 +42,7 @@ WebSocketFrameParser::WebSocketFrameParser()
             '\0');
 }
 
-WebSocketFrameParser::~WebSocketFrameParser() {}
+WebSocketFrameParser::~WebSocketFrameParser() = default;
 
 bool WebSocketFrameParser::Decode(
     const char* data,

diff --git a/net/websockets/websocket_handshake_request_info.cc b/net/websockets/websocket_handshake_request_info.cc
@@ -14,6 +14,6 @@ WebSocketHandshakeRequestInfo::WebSocketHandshakeRequestInfo(
     base::Time request_time)
     : url(url), request_time(request_time) {}
 
-WebSocketHandshakeRequestInfo::~WebSocketHandshakeRequestInfo() {}
+WebSocketHandshakeRequestInfo::~WebSocketHandshakeRequestInfo() = default;
 
 }  // namespace net
diff --git a/net/websockets/websocket_handshake_response_info.cc b/net/websockets/websocket_handshake_response_info.cc
@@ -25,6 +25,6 @@ WebSocketHandshakeResponseInfo::WebSocketHandshakeResponseInfo(
       headers(headers),
       response_time(response_time) {}
 
-WebSocketHandshakeResponseInfo::~WebSocketHandshakeResponseInfo() {}
+WebSocketHandshakeResponseInfo::~WebSocketHandshakeResponseInfo() = default;
 
 }  // namespace net
diff --git a/net/websockets/websocket_handshake_stream_create_helper.cc b/net/websockets/websocket_handshake_stream_create_helper.cc
@@ -23,7 +23,8 @@ WebSocketHandshakeStreamCreateHelper::WebSocketHandshakeStreamCreateHelper(
   DCHECK(connect_delegate_);
 }
 
-WebSocketHandshakeStreamCreateHelper::~WebSocketHandshakeStreamCreateHelper() {}
+WebSocketHandshakeStreamCreateHelper::~WebSocketHandshakeStreamCreateHelper() =
+    default;
 
 std::unique_ptr<WebSocketHandshakeStreamBase>
 WebSocketHandshakeStreamCreateHelper::CreateBasicStream(

diff --git a/net/websockets/websocket_handshake_stream_create_helper_test.cc b/net/websockets/websocket_handshake_stream_create_helper_test.cc
@@ -63,7 +63,7 @@ class MockClientSocketHandleFactory {
 
 class TestConnectDelegate : public WebSocketStream::ConnectDelegate {
  public:
-  ~TestConnectDelegate() override {}
+  ~TestConnectDelegate() override = default;
 
   void OnCreateRequest(URLRequest* request) override {}
   void OnSuccess(std::unique_ptr<WebSocketStream> stream) override {}

diff --git a/net/websockets/websocket_inflater.cc b/net/websockets/websocket_inflater.cc
@@ -26,7 +26,7 @@ class ShrinkableIOBufferWithSize : public IOBufferWithSize {
   }
 
  private:
-  ~ShrinkableIOBufferWithSize() override {}
+  ~ShrinkableIOBufferWithSize() override = default;
 };
 
 }  // namespace
@@ -171,7 +171,7 @@ WebSocketInflater::OutputBuffer::OutputBuffer(size_t capacity)
       head_(0),
       tail_(0) {}
 
-WebSocketInflater::OutputBuffer::~OutputBuffer() {}
+WebSocketInflater::OutputBuffer::~OutputBuffer() = default;
 
 size_t WebSocketInflater::OutputBuffer::Size() const {
   return (tail_ + buffer_.size() - head_) % buffer_.size();
@@ -221,7 +221,7 @@ void WebSocketInflater::OutputBuffer::AdvanceTail(size_t advance) {
 WebSocketInflater::InputQueue::InputQueue(size_t capacity)
     : capacity_(capacity), head_of_first_buffer_(0), tail_of_last_buffer_(0) {}
 
-WebSocketInflater::InputQueue::~InputQueue() {}
+WebSocketInflater::InputQueue::~InputQueue() = default;
 
 std::pair<char*, size_t> WebSocketInflater::InputQueue::Top() {
   DCHECK(!IsEmpty());

diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc
@@ -147,7 +147,7 @@ class WebSocketStreamRequestImpl : public WebSocketStreamRequest {
 
   // Destroying this object destroys the URLRequest, which cancels the request
   // and so terminates the handshake if it is incomplete.
-  ~WebSocketStreamRequestImpl() override {}
+  ~WebSocketStreamRequestImpl() override = default;
 
   void OnHandshakeStreamCreated(
       WebSocketHandshakeStreamBase* handshake_stream) override {
@@ -386,12 +386,12 @@ void Delegate::OnReadCompleted(URLRequest* request, int bytes_read) {
 
 }  // namespace
 
-WebSocketStreamRequest::~WebSocketStreamRequest() {}
+WebSocketStreamRequest::~WebSocketStreamRequest() = default;
 
-WebSocketStream::WebSocketStream() {}
-WebSocketStream::~WebSocketStream() {}
+WebSocketStream::WebSocketStream() = default;
+WebSocketStream::~WebSocketStream() = default;
 
-WebSocketStream::ConnectDelegate::~ConnectDelegate() {}
+WebSocketStream::ConnectDelegate::~ConnectDelegate() = default;
 
 std::unique_ptr<WebSocketStreamRequest> WebSocketStream::CreateAndConnectStream(
     const GURL& socket_url,

diff --git a/net/websockets/websocket_stream_create_test_base.cc b/net/websockets/websocket_stream_create_test_base.cc
@@ -98,8 +98,7 @@ class WebSocketStreamCreateTestBase::TestConnectDelegate
 WebSocketStreamCreateTestBase::WebSocketStreamCreateTestBase()
     : has_failed_(false), ssl_fatal_(false), url_request_(nullptr) {}
 
-WebSocketStreamCreateTestBase::~WebSocketStreamCreateTestBase() {
-}
+WebSocketStreamCreateTestBase::~WebSocketStreamCreateTestBase() = default;
 
 void WebSocketStreamCreateTestBase::CreateAndConnectStream(
     const GURL& socket_url,

diff --git a/net/websockets/websocket_test_util.cc b/net/websockets/websocket_test_util.cc
@@ -105,8 +105,7 @@ WebSocketMockClientSocketFactoryMaker::WebSocketMockClientSocketFactoryMaker()
 }
 
 WebSocketMockClientSocketFactoryMaker::
-    ~WebSocketMockClientSocketFactoryMaker() {
-}
+    ~WebSocketMockClientSocketFactoryMaker() = default;
 
 MockClientSocketFactory* WebSocketMockClientSocketFactoryMaker::factory() {
   return &detail_->factory;
@@ -157,7 +156,8 @@ WebSocketTestURLRequestContextHost::WebSocketTestURLRequestContextHost()
   url_request_context_.set_client_socket_factory(maker_.factory());
 }
 
-WebSocketTestURLRequestContextHost::~WebSocketTestURLRequestContextHost() {}
+WebSocketTestURLRequestContextHost::~WebSocketTestURLRequestContextHost() =
+    default;
 
 void WebSocketTestURLRequestContextHost::AddRawExpectations(
     std::unique_ptr<SequencedSocketData> socket_data) {