Cleanup: Remove unneeded forward declararations in net.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/8525020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109590 0039d316-1c4b-4281-b951-d872f2087c98

26 files changed, 28 insertions, 66 deletions

diff --git a/net/base/host_resolver.h b/net/base/host_resolver.h
index 0abc318..cfd1c6e 100644
--- a/net/base/host_resolver.h
+++ b/net/base/host_resolver.h
@@ -22,7 +22,6 @@ namespace net {
 class AddressList;
 class BoundNetLog;
 class HostCache;
-class HostResolverImpl;
 class HostResolverProc;
 class NetLog;
 
diff --git a/net/base/network_delegate.h b/net/base/network_delegate.h
index 7ba4790..64c4918 100644
--- a/net/base/network_delegate.h
+++ b/net/base/network_delegate.h
@@ -26,7 +26,6 @@ namespace net {
 // NOTE: It is not okay to add any compile-time dependencies on symbols outside
 // of net/base here, because we have a net_base library. Forward declarations
 // are ok.
-class HostPortPair;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
 class URLRequest;
diff --git a/net/curvecp/messenger.h b/net/curvecp/messenger.h
index 8377358..d130b8a 100644
--- a/net/curvecp/messenger.h
+++ b/net/curvecp/messenger.h
@@ -23,7 +23,6 @@
 
 namespace net {
 
-class DrainableIOBuffer;
 class IOBufferWithSize;
 class Packetizer;
 
diff --git a/net/curvecp/received_block_list.h b/net/curvecp/received_block_list.h
index 4c05ecf..22755f5 100644
--- a/net/curvecp/received_block_list.h
+++ b/net/curvecp/received_block_list.h
@@ -13,7 +13,6 @@ namespace net {
 
 class DrainableIOBuffer;
 class IOBuffer;
-class IOBufferWithSize;
 
 // A ReceivedBlockList manages everything needed to track a set of of incoming
 // blocks.  It can coalesce continuous blocks and locate holes in the received
diff --git a/net/dns/async_host_resolver.h b/net/dns/async_host_resolver.h
index f7e5c53..9ad5c01 100644
--- a/net/dns/async_host_resolver.h
+++ b/net/dns/async_host_resolver.h
@@ -21,7 +21,6 @@
 
 namespace net {
 
-class AddressesList;
 class ClientSocketFactory;
 
 class NET_EXPORT AsyncHostResolver
diff --git a/net/dns/watching_file_reader.h b/net/dns/watching_file_reader.h
index e93004e..6290dd3 100644
--- a/net/dns/watching_file_reader.h
+++ b/net/dns/watching_file_reader.h
@@ -16,11 +16,6 @@
 #include "net/base/net_export.h"
 #include "net/dns/serial_worker.h"
 
-// Forward declaration
-namespace base {
-class MessageLoopProxy;
-}
-
 namespace net {
 
 // Allows mocking FilePathWatcher
@@ -93,4 +88,3 @@ class NET_EXPORT_PRIVATE WatchingFileReader
 }  // namespace net
 
 #endif  // NET_DNS_WATCHING_FILE_READER_H_
-
diff --git a/net/http/http_cache_transaction.h b/net/http/http_cache_transaction.h
index cc96e80..810c8f9 100644
--- a/net/http/http_cache_transaction.h
+++ b/net/http/http_cache_transaction.h
@@ -20,7 +20,6 @@
 
 namespace net {
 
-class HttpResponseHeaders;
 class PartialData;
 struct HttpRequestInfo;
 
@@ -57,7 +56,7 @@ class HttpCache::Transaction : public HttpTransaction {
     UPDATE          = READ_META | WRITE,  // READ_WRITE & ~READ_DATA
   };
 
-  Transaction(HttpCache* cache);
+  explicit Transaction(HttpCache* cache);
   virtual ~Transaction();
 
   Mode mode() const { return mode_; }
@@ -79,7 +78,9 @@ class HttpCache::Transaction : public HttpTransaction {
   // response (or response info) must be evaluated by the caller, for instance
   // to make sure that the response_time is as expected, before calling this
   // method.
-  int WriteMetadata(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
+  int WriteMetadata(IOBuffer* buf,
+                    int buf_len,
+                    OldCompletionCallback* callback);
 
   // This transaction is being deleted and we are not done writing to the cache.
   // We need to indicate that the response data was truncated.  Returns true on
diff --git a/net/http/http_network_transaction.h b/net/http/http_network_transaction.h
index a7c5bc0..a2afd84 100644
--- a/net/http/http_network_transaction.h
+++ b/net/http/http_network_transaction.h
@@ -30,6 +30,7 @@ class HttpNetworkSession;
 class HttpStream;
 class HttpStreamRequest;
 class IOBuffer;
+class UploadDataStream;
 struct HttpRequestInfo;
 
 class NET_EXPORT_PRIVATE HttpNetworkTransaction
diff --git a/net/http/http_pipelined_stream.h b/net/http/http_pipelined_stream.h
index dfafe69..fce7a08 100644
--- a/net/http/http_pipelined_stream.h
+++ b/net/http/http_pipelined_stream.h
@@ -20,7 +20,6 @@ class HttpPipelinedConnectionImpl;
 class HttpResponseInfo;
 class HttpRequestHeaders;
 struct HttpRequestInfo;
-class HttpStreamParser;
 class IOBuffer;
 class ProxyInfo;
 struct SSLConfig;
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index 816a5cb..5b85252 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -27,7 +27,6 @@ class AddressList;
 class ClientSocketHandle;
 class GrowableIOBuffer;
 class HttpAuthCache;
-class HttpAuthHandleFactory;
 class HttpStream;
 class HttpStreamParser;
 class IOBuffer;
@@ -83,7 +82,9 @@ class HttpProxyClientSocket : public ProxyClientSocket {
 
   // Socket methods:
   virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
-  virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
+  virtual int Write(IOBuffer* buf,
+                    int buf_len,
+                    OldCompletionCallback* callback);
   virtual bool SetReceiveBufferSize(int32 size);
   virtual bool SetSendBufferSize(int32 size);
   virtual int GetPeerAddress(AddressList* address) const;
diff --git a/net/http/http_stream_factory.h b/net/http/http_stream_factory.h
index 913ad38..bf56656 100644
--- a/net/http/http_stream_factory.h
+++ b/net/http/http_stream_factory.h
@@ -24,15 +24,12 @@ class BoundNetLog;
 class HostMappingRules;
 class HostPortPair;
 class HttpAuthController;
-class HttpNetworkSession;
-class HttpPipelinedHost;
 class HttpResponseInfo;
 class HttpServerProperties;
 class HttpStream;
 class ProxyInfo;
 class SSLCertRequestInfo;
 class SSLInfo;
-class X509Certificate;
 struct HttpRequestInfo;
 struct SSLConfig;
 
diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
index 9b38dc4..66aee43 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -23,11 +23,7 @@ namespace net {
 class ClientSocketHandle;
 class HttpAuthController;
 class HttpNetworkSession;
-class HttpPipelinedConnection;
-class HttpProxySocketParams;
 class HttpStream;
-class SOCKSSocketParams;
-class SSLSocketParams;
 class TransportSocketParams;
 
 // An HttpStreamRequestImpl exists for each stream which is in progress of being
diff --git a/net/http/http_util.h b/net/http/http_util.h
index 0ac2a7e..9a4b8ce 100644
--- a/net/http/http_util.h
+++ b/net/http/http_util.h
@@ -21,8 +21,6 @@
 
 namespace net {
 
-class UploadDataStream;
-
 class NET_EXPORT HttpUtil {
  public:
   // Returns the absolute path of the URL, to be used for the http request.
@@ -49,7 +47,7 @@ class NET_EXPORT HttpUtil {
   static void ParseContentType(const std::string& content_type_str,
                                std::string* mime_type,
                                std::string* charset,
-                               bool *had_charset);
+                               bool* had_charset);
 
   // Scans the headers and look for the first "Range" header in |headers|,
   // if "Range" exists and the first one of it is well formatted then returns
diff --git a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
index ffbe9c0..562441f 100644
--- a/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
+++ b/net/proxy/dhcp_proxy_script_adapter_fetcher_win.h
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_PROXY_DHCP_SCRIPT_ADAPTER_FETCHER_WIN_H_
-#define NET_PROXY_DHCP_SCRIPT_ADAPTER_FETCHER_WIN_H_
+#ifndef NET_PROXY_DHCP_PROXY_SCRIPT_ADAPTER_FETCHER_WIN_H_
+#define NET_PROXY_DHCP_PROXY_SCRIPT_ADAPTER_FETCHER_WIN_H_
 #pragma once
 
+#include <string>
+
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -16,10 +18,6 @@
 #include "net/base/net_export.h"
 #include "googleurl/src/gurl.h"
 
-namespace base {
-class MessageLoopProxy;
-}
-
 namespace net {
 
 class ProxyScriptFetcher;
@@ -180,4 +178,4 @@ class NET_EXPORT_PRIVATE DhcpProxyScriptAdapterFetcher
 
 }  // namespace net
 
-#endif  // NET_PROXY_DHCP_SCRIPT_ADAPTER_FETCHER_WIN_H_
+#endif  // NET_PROXY_DHCP_PROXY_SCRIPT_ADAPTER_FETCHER_WIN_H_
diff --git a/net/proxy/init_proxy_resolver.h b/net/proxy/init_proxy_resolver.h
index 4c90ab4..b656c76 100644
--- a/net/proxy/init_proxy_resolver.h
+++ b/net/proxy/init_proxy_resolver.h
@@ -24,7 +24,6 @@ class NetLogParameter;
 class ProxyConfig;
 class ProxyResolver;
 class ProxyScriptFetcher;
-class URLRequestContext;
 
 // InitProxyResolver is a helper class used by ProxyService to
 // initialize a ProxyResolver with the PAC script data specified
diff --git a/net/proxy/proxy_script_fetcher_impl.h b/net/proxy/proxy_script_fetcher_impl.h
index a2a7b17..964030a 100644
--- a/net/proxy/proxy_script_fetcher_impl.h
+++ b/net/proxy/proxy_script_fetcher_impl.h
@@ -6,6 +6,8 @@
 #define NET_PROXY_PROXY_SCRIPT_FETCHER_IMPL_H_
 #pragma once
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ -17,7 +19,6 @@
 #include "net/url_request/url_request.h"
 
 class GURL;
-class X509Certificate;
 
 namespace net {
 
diff --git a/net/proxy/proxy_service.h b/net/proxy/proxy_service.h
index f8c866c..ff5012f 100644
--- a/net/proxy/proxy_service.h
+++ b/net/proxy/proxy_service.h
@@ -6,6 +6,7 @@
 #define NET_PROXY_PROXY_SERVICE_H_
 #pragma once
 
+#include <string>
 #include <vector>
 
 #include "base/gtest_prod_util.h"
@@ -33,7 +34,6 @@ class InitProxyResolver;
 class NetworkDelegate;
 class ProxyResolver;
 class ProxyScriptFetcher;
-class URLRequestContext;
 
 // This class can be used to resolve the proxy server to use when loading a
 // HTTP(S) URL.  It uses the given ProxyResolver to handle the actual proxy
diff --git a/net/server/http_connection.h b/net/server/http_connection.h
index 83348b7..e22cb27 100644
--- a/net/server/http_connection.h
+++ b/net/server/http_connection.h
@@ -15,7 +15,6 @@
 namespace net {
 
 class HttpServer;
-class HttpServerRequestInfo;
 class ListenSocket;
 class WebSocket;
 
@@ -51,4 +50,4 @@ class HttpConnection {
 
 }  // namespace net
 
-#endif // NET_SERVER_HTTP_CONNECTION_H_
+#endif  // NET_SERVER_HTTP_CONNECTION_H_
diff --git a/net/socket/client_socket_factory.h b/net/socket/client_socket_factory.h
index 0f35194..884fc4f 100644
--- a/net/socket/client_socket_factory.h
+++ b/net/socket/client_socket_factory.h
@@ -17,10 +17,8 @@
 namespace net {
 
 class AddressList;
-class CertVerifier;
 class ClientSocketHandle;
 class DatagramClientSocket;
-class DnsCertProvenanceChecker;
 class HostPortPair;
 class SSLClientSocket;
 struct SSLClientSocketContext;
diff --git a/net/socket/ssl_client_socket_pool.h b/net/socket/ssl_client_socket_pool.h
index e29bea5..2437a55 100644
--- a/net/socket/ssl_client_socket_pool.h
+++ b/net/socket/ssl_client_socket_pool.h
@@ -36,7 +36,6 @@ class SSLClientSocket;
 class SSLHostInfoFactory;
 class TransportSocketParams;
 class TransportClientSocketPool;
-struct RRResponse;
 
 // SSLSocketParams only needs the socket params for the transport socket
 // that will be used (denoted by |proxy|).
diff --git a/net/socket/ssl_server_socket.h b/net/socket/ssl_server_socket.h
index bdf5b80..8e0ad60 100644
--- a/net/socket/ssl_server_socket.h
+++ b/net/socket/ssl_server_socket.h
@@ -20,7 +20,6 @@ class RSAPrivateKey;
 
 namespace net {
 
-class IOBuffer;
 struct SSLConfig;
 class X509Certificate;
 
diff --git a/net/spdy/spdy_proxy_client_socket.h b/net/spdy/spdy_proxy_client_socket.h
index 6f6e5a8..936efdb 100644
--- a/net/spdy/spdy_proxy_client_socket.h
+++ b/net/spdy/spdy_proxy_client_socket.h
@@ -30,10 +30,8 @@ class GURL;
 namespace net {
 
 class AddressList;
-class ClientSocketHandle;
 class HttpStream;
 class IOBuffer;
-class SpdySession;
 class SpdyStream;
 
 class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
@@ -82,7 +80,9 @@ class NET_EXPORT_PRIVATE SpdyProxyClientSocket : public ProxyClientSocket,
 
   // Socket methods:
   virtual int Read(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
-  virtual int Write(IOBuffer* buf, int buf_len, OldCompletionCallback* callback);
+  virtual int Write(IOBuffer* buf,
+                    int buf_len,
+                    OldCompletionCallback* callback);
   virtual bool SetReceiveBufferSize(int32 size);
   virtual bool SetSendBufferSize(int32 size);
   virtual int GetPeerAddress(AddressList* address) const;
diff --git a/net/spdy/spdy_session_pool.h b/net/spdy/spdy_session_pool.h
index 3b1ec78..9da713e 100644
--- a/net/spdy/spdy_session_pool.h
+++ b/net/spdy/spdy_session_pool.h
@@ -31,7 +31,6 @@ class AddressList;
 class BoundNetLog;
 class ClientSocketHandle;
 class HostResolver;
-class HttpNetworkSession;
 class SpdySession;
 
 // This is a very simple pool for open SpdySessions.
diff --git a/net/tools/flip_server/spdy_interface.h b/net/tools/flip_server/spdy_interface.h
index 179b10c..e9bedc1 100644
--- a/net/tools/flip_server/spdy_interface.h
+++ b/net/tools/flip_server/spdy_interface.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_TOOLS_FLIP_SERVER_SPDY_INTERFACE_
-#define NET_TOOLS_FLIP_SERVER_SPDY_INTERFACE_
+#ifndef NET_TOOLS_FLIP_SERVER_SPDY_INTERFACE_H_
+#define NET_TOOLS_FLIP_SERVER_SPDY_INTERFACE_H_
 
 #include <map>
 #include <string>
@@ -19,7 +19,6 @@
 
 namespace net {
 
-class BalsaFrame;
 class FlipAcceptor;
 class MemoryCache;
 
@@ -57,8 +56,8 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
   SMInterface* FindOrMakeNewSMConnectionInterface(std::string server_ip,
                                                   std::string server_port);
   int SpdyHandleNewStream(const spdy::SpdyControlFrame* frame,
-                          std::string &http_data,
-                          bool *is_https_scheme);
+                          std::string& http_data,
+                          bool* is_https_scheme);
 
   // SpdyFramerVisitor interface.
   virtual void OnControl(const spdy::SpdyControlFrame* frame);
@@ -82,7 +81,7 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
   // SMInterface's Cleanup is currently only called by SMConnection after a
   // protocol message as been fully read. Spdy's SMInterface does not need
   // to do any cleanup at this time.
-  // TODO (klindsay) This method is probably not being used properly and
+  // TODO(klindsay) This method is probably not being used properly and
   // some logic review and method renaming is probably in order.
   virtual void Cleanup() {}
   // Send a settings frame
@@ -143,5 +142,4 @@ class SpdySM : public spdy::SpdyFramerVisitorInterface,
 
 }  // namespace net
 
-#endif  // NET_TOOLS_FLIP_SERVER_SPDY_INTERFACE_
-
+#endif  // NET_TOOLS_FLIP_SERVER_SPDY_INTERFACE_H_
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 712460b..44b8d68 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -54,12 +54,6 @@ class Time;
 
 // Temporary layering violation to allow existing users of a deprecated
 // interface.
-namespace chrome_browser_net {
-class ConnectInterceptor;
-}
-
-// Temporary layering violation to allow existing users of a deprecated
-// interface.
 namespace fileapi {
 class FileSystemDirURLRequestJobTest;
 class FileSystemOperationWriteTest;
diff --git a/net/url_request/url_request_test_util.h b/net/url_request/url_request_test_util.h
index 7ad071a..3407e12 100644
--- a/net/url_request/url_request_test_util.h
+++ b/net/url_request/url_request_test_util.h
@@ -8,7 +8,7 @@
 
 #include <stdlib.h>
 
-#include <sstream>
+#include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
@@ -39,10 +39,6 @@
 
 using base::TimeDelta;
 
-namespace net {
-class HostPortPair;
-}
-
 //-----------------------------------------------------------------------------
 
 class TestURLRequestContext : public net::URLRequestContext {