From ecef1ff71284719fa8e1a1e23372175ba828a4be Mon Sep 17 00:00:00 2001 From: "erg@google.com" Date: Fri, 4 Feb 2011 18:35:54 +0000 Subject: Cleanup the net/tools/ directory so there are no warnings from our clang plugin. (I've separated this chunk out since mbelshe said he was working here and I don't want to accidentally clobber his work. This is the last patch before Nico can turn the inlining plugin on for all targets.) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/6368037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73820 0039d316-1c4b-4281-b951-d872f2087c98 --- net/tools/fetch/http_listen_socket.cc | 4 ++++ net/tools/fetch/http_listen_socket.h | 2 +- net/tools/fetch/http_server_request_info.cc | 11 +++++++++++ net/tools/fetch/http_server_request_info.h | 5 +++-- net/tools/fetch/http_server_response_info.cc | 11 +++++++++++ net/tools/fetch/http_server_response_info.h | 7 +++---- 6 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 net/tools/fetch/http_server_request_info.cc create mode 100644 net/tools/fetch/http_server_response_info.cc (limited to 'net/tools/fetch') diff --git a/net/tools/fetch/http_listen_socket.cc b/net/tools/fetch/http_listen_socket.cc index 0db714f..78d924d 100644 --- a/net/tools/fetch/http_listen_socket.cc +++ b/net/tools/fetch/http_listen_socket.cc @@ -24,6 +24,10 @@ HttpListenSocket::HttpListenSocket(SOCKET s, HttpListenSocket::~HttpListenSocket() { } +void HttpListenSocket::Listen() { + ListenSocket::Listen(); +} + void HttpListenSocket::Accept() { SOCKET conn = ListenSocket::Accept(socket_); DCHECK_NE(conn, ListenSocket::kInvalidSocket); diff --git a/net/tools/fetch/http_listen_socket.h b/net/tools/fetch/http_listen_socket.h index 781ac32..82f5312 100644 --- a/net/tools/fetch/http_listen_socket.h +++ b/net/tools/fetch/http_listen_socket.h @@ -28,7 +28,7 @@ class HttpListenSocket : public ListenSocket, static HttpListenSocket* Listen(const std::string& ip, int port, HttpListenSocket::Delegate* delegate); - void Listen() { ListenSocket::Listen(); } + virtual void Listen(); virtual void Accept(); // Send a server response. diff --git a/net/tools/fetch/http_server_request_info.cc b/net/tools/fetch/http_server_request_info.cc new file mode 100644 index 0000000..52b6860 --- /dev/null +++ b/net/tools/fetch/http_server_request_info.cc @@ -0,0 +1,11 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/tools/fetch/http_server_request_info.h" + +HttpServerRequestInfo::HttpServerRequestInfo() + : net::HttpRequestInfo() { +} + +HttpServerRequestInfo::~HttpServerRequestInfo() {} diff --git a/net/tools/fetch/http_server_request_info.h b/net/tools/fetch/http_server_request_info.h index 2b7cfb5..9a94dcd 100644 --- a/net/tools/fetch/http_server_request_info.h +++ b/net/tools/fetch/http_server_request_info.h @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -17,7 +17,8 @@ // does). class HttpServerRequestInfo : public net::HttpRequestInfo { public: - HttpServerRequestInfo() : net::HttpRequestInfo() {} + HttpServerRequestInfo(); + virtual ~HttpServerRequestInfo(); // A map of the names -> values for HTTP headers. std::map headers; diff --git a/net/tools/fetch/http_server_response_info.cc b/net/tools/fetch/http_server_response_info.cc new file mode 100644 index 0000000..d9ca02a --- /dev/null +++ b/net/tools/fetch/http_server_response_info.cc @@ -0,0 +1,11 @@ +// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "net/tools/fetch/http_server_response_info.h" + +HttpServerResponseInfo::HttpServerResponseInfo() + : status(200), content_length(0), connection_close(false) { +} + +HttpServerResponseInfo::~HttpServerResponseInfo() {} diff --git a/net/tools/fetch/http_server_response_info.h b/net/tools/fetch/http_server_response_info.h index 7a8bb1f..d0ef863 100644 --- a/net/tools/fetch/http_server_response_info.h +++ b/net/tools/fetch/http_server_response_info.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -12,9 +12,8 @@ // Meta information about a server response. class HttpServerResponseInfo { public: - HttpServerResponseInfo() - : status(200), content_length(0), connection_close(false) { - } + HttpServerResponseInfo(); + ~HttpServerResponseInfo(); // The response protocol. std::string protocol; -- cgit v1.1