Reduce the amount of included header files. Vast change like in "Oh God! This revision changes half of the source files!".

Review URL: http://codereview.chromium.org/20378

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

38 files changed, 259 insertions, 109 deletions

diff --git a/net/base/client_socket.cc b/net/base/client_socket.cc
new file mode 100644
index 0000000..4c607fa
--- /dev/null
+++ b/net/base/client_socket.cc
@@ -0,0 +1,22 @@
+// Copyright (c) 2009 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/base/client_socket.h"
+
+#include "base/logging.h"
+#include "net/base/net_errors.h"
+
+namespace net {
+
+#if defined(OS_LINUX)
+// Identical to posix system call getpeername().
+// Needed by ssl_client_socket_nss.
+int ClientSocket::GetPeerName(struct sockaddr *name, socklen_t *namelen) {
+  // Default implementation just permits some unit tests to link.
+  NOTREACHED();
+  return ERR_UNEXPECTED;
+}
+#endif
+
+}  // namespace net
diff --git a/net/base/client_socket.h b/net/base/client_socket.h
index 97495dd..b96f07b 100644
--- a/net/base/client_socket.h
+++ b/net/base/client_socket.h
@@ -5,9 +5,13 @@
 #ifndef NET_BASE_CLIENT_SOCKET_H_
 #define NET_BASE_CLIENT_SOCKET_H_
 
-#include "base/logging.h"
+#include "build/build_config.h"
+
+#if defined(OS_LINUX)
+#include <sys/socket.h>
+#endif
+
 #include "net/base/socket.h"
-#include "net/base/net_errors.h"
 
 namespace net {
 
@@ -46,11 +50,7 @@ class ClientSocket : public Socket {
 #if defined(OS_LINUX)
   // Identical to posix system call getpeername().
   // Needed by ssl_client_socket_nss.
-  virtual int GetPeerName(struct sockaddr *name, socklen_t *namelen) {
-    // Default implementation just permits some unit tests to link.
-    NOTREACHED();
-    return ERR_UNEXPECTED;
-  }
+  virtual int GetPeerName(struct sockaddr *name, socklen_t *namelen);
 #endif
 };
 
diff --git a/net/base/io_buffer.cc b/net/base/io_buffer.cc
new file mode 100644
index 0000000..c9b4532
--- /dev/null
+++ b/net/base/io_buffer.cc
@@ -0,0 +1,16 @@
+// Copyright (c) 2009 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/base/io_buffer.h"
+
+#include "base/logging.h"
+
+namespace net {
+
+IOBuffer::IOBuffer(int buffer_size) {
+  DCHECK(buffer_size);
+  data_ = new char[buffer_size];
+}
+
+}  // namespace net
diff --git a/net/base/io_buffer.h b/net/base/io_buffer.h
index 88066c2..48d69d6 100644
--- a/net/base/io_buffer.h
+++ b/net/base/io_buffer.h
@@ -5,7 +5,6 @@
 #ifndef NET_BASE_IO_BUFFER_H_
 #define NET_BASE_IO_BUFFER_H_
 
-#include "base/logging.h"
 #include "base/ref_counted.h"
 
 namespace net {
@@ -15,10 +14,7 @@ namespace net {
 class IOBuffer : public base::RefCountedThreadSafe<IOBuffer> {
  public:
   IOBuffer() : data_(NULL) {}
-  explicit IOBuffer(int buffer_size) {
-    DCHECK(buffer_size);
-    data_ = new char[buffer_size];
-  }
+  explicit IOBuffer(int buffer_size);
   explicit IOBuffer(char* data) : data_(data) {}
   virtual ~IOBuffer() {
     delete[] data_;
diff --git a/net/base/upload_data.h b/net/base/upload_data.h
index 04e1529..3174b77 100644
--- a/net/base/upload_data.h
+++ b/net/base/upload_data.h
@@ -2,13 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_BASE_UPLOAD_DATA_H__
-#define NET_BASE_UPLOAD_DATA_H__
+#ifndef NET_BASE_UPLOAD_DATA_H_
+#define NET_BASE_UPLOAD_DATA_H_
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/ref_counted.h"
 
 namespace net {
@@ -98,5 +97,4 @@ class UploadData : public base::RefCounted<UploadData> {
 
 }  // namespace net
 
-#endif  // NET_BASE_UPLOAD_DATA_H__
-
+#endif  // NET_BASE_UPLOAD_DATA_H_
diff --git a/net/build/net.vcproj b/net/build/net.vcproj
index 073c377..dac85da 100644
--- a/net/build/net.vcproj
+++ b/net/build/net.vcproj
@@ -14,7 +14,7 @@
 	</Platforms>
 	<ToolFiles>
 		<ToolFile
-			RelativePath="convert_tld_data.rules"
+			RelativePath=".\convert_tld_data.rules"
 		/>
 	</ToolFiles>
 	<Configurations>
@@ -185,6 +185,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\base\client_socket.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\base\client_socket.h"
 				>
 			</File>
@@ -325,6 +329,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\base\io_buffer.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\base\io_buffer.h"
 				>
 			</File>
@@ -789,6 +797,10 @@
 				>
 			</File>
 			<File
+				RelativePath="..\http\http_response_info.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\http\http_response_info.h"
 				>
 			</File>
@@ -821,6 +833,10 @@
 			Name="disk_cache"
 			>
 			<File
+				RelativePath="..\disk_cache\addr.cc"
+				>
+			</File>
+			<File
 				RelativePath="..\disk_cache\addr.h"
 				>
 			</File>
diff --git a/net/disk_cache/addr.cc b/net/disk_cache/addr.cc
new file mode 100644
index 0000000..aa84c01
--- /dev/null
+++ b/net/disk_cache/addr.cc
@@ -0,0 +1,29 @@
+// Copyright (c) 2009 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/disk_cache/addr.h"
+
+#include "base/logging.h"
+
+namespace disk_cache {
+
+int Addr::start_block() const {
+  DCHECK(is_block_file());
+  return value_ & kStartBlockMask;
+}
+
+int Addr::num_blocks() const {
+  DCHECK(is_block_file() || !value_);
+  return ((value_ & kNumBlocksMask) >> kNumBlocksOffset) + 1;
+}
+
+bool Addr::SetFileNumber(int file_number) {
+  DCHECK(is_separate_file());
+  if (file_number & ~kFileNameMask)
+    return false;
+  value_ = kInitializedMask | file_number;
+  return true;
+}
+
+}  // namespace disk_cache
diff --git a/net/disk_cache/addr.h b/net/disk_cache/addr.h
index 375b2c5..a504019 100644
--- a/net/disk_cache/addr.h
+++ b/net/disk_cache/addr.h
@@ -5,11 +5,9 @@
 // This is an internal class that handles the address of a cache record.
 // See net/disk_cache/disk_cache.h for the public interface of the cache.
 
-#ifndef NET_DISK_CACHE_ADDR_H__
-#define NET_DISK_CACHE_ADDR_H__
+#ifndef NET_DISK_CACHE_ADDR_H_
+#define NET_DISK_CACHE_ADDR_H_
 
-#include "base/basictypes.h"
-#include "base/logging.h"
 #include "net/disk_cache/disk_format.h"
 
 namespace disk_cache {
@@ -87,24 +85,9 @@ class Addr {
       return ((value_ & kFileSelectorMask) >> kFileSelectorOffset);
   }
 
-  int start_block() const {
-    DCHECK(is_block_file());
-    return value_ & kStartBlockMask;
-  }
-
-  int num_blocks() const {
-    DCHECK(is_block_file() || !value_);
-    return ((value_ & kNumBlocksMask) >> kNumBlocksOffset) + 1;
-  }
-
-  bool SetFileNumber(int file_number) {
-    DCHECK(is_separate_file());
-    if (file_number & ~kFileNameMask)
-      return false;
-    value_ = kInitializedMask | file_number;
-    return true;
-  }
-
+  int start_block() const;
+  int num_blocks() const;
+  bool SetFileNumber(int file_number);
   int BlockSize() const {
     return BlockSizeForFileType(file_type());
   }
@@ -151,5 +134,4 @@ class Addr {
 
 }  // namespace disk_cache
 
-#endif  // NET_DISK_CACHE_ADDR_H__
-
+#endif  // NET_DISK_CACHE_ADDR_H_
diff --git a/net/disk_cache/rankings.h b/net/disk_cache/rankings.h
index 1434235..d4c10afd 100644
--- a/net/disk_cache/rankings.h
+++ b/net/disk_cache/rankings.h
@@ -9,6 +9,7 @@
 
 #include <list>
 
+#include "base/scoped_ptr.h"
 #include "net/disk_cache/addr.h"
 #include "net/disk_cache/mapped_file.h"
 #include "net/disk_cache/storage_block.h"
diff --git a/net/disk_cache/storage_block-inl.h b/net/disk_cache/storage_block-inl.h
index 2082b0a..485a1b1 100644
--- a/net/disk_cache/storage_block-inl.h
+++ b/net/disk_cache/storage_block-inl.h
@@ -2,11 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_DISK_CACHE_CACHE_INTERNAL_INL_H__
-#define NET_DISK_CACHE_CACHE_INTERNAL_INL_H__
+#ifndef NET_DISK_CACHE_CACHE_INTERNAL_INL_H_
+#define NET_DISK_CACHE_CACHE_INTERNAL_INL_H_
 
 #include "net/disk_cache/storage_block.h"
 
+#include "base/logging.h"
 #include "net/disk_cache/trace.h"
 
 namespace disk_cache {
@@ -132,5 +133,4 @@ template<typename T> void StorageBlock<T>::DeleteData() {
 
 }  // namespace disk_cache
 
-#endif  // NET_DISK_CACHE_CACHE_INTERNAL_INL_H__
-
+#endif  // NET_DISK_CACHE_CACHE_INTERNAL_INL_H_
diff --git a/net/http/http_cache.cc b/net/http/http_cache.cc
index bf42584..6245920 100644
--- a/net/http/http_cache.cc
+++ b/net/http/http_cache.cc
@@ -18,6 +18,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction.h"
 #include "net/http/http_util.h"
diff --git a/net/http/http_cache.h b/net/http/http_cache.h
index 63e5257..51991f5 100644
--- a/net/http/http_cache.h
+++ b/net/http/http_cache.h
@@ -15,7 +15,7 @@
 #define NET_HTTP_HTTP_CACHE_H_
 
 #include <list>
-#include <string>
+#include <set>
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
diff --git a/net/http/http_network_transaction.cc b/net/http/http_network_transaction.cc
index fb9489c..f7aeff6 100644
--- a/net/http/http_network_transaction.cc
+++ b/net/http/http_network_transaction.cc
@@ -23,6 +23,7 @@
 #include "net/http/http_chunked_decoder.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 using base::Time;
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
new file mode 100644
index 0000000..ad6ef87
--- /dev/null
+++ b/net/http/http_response_info.cc
@@ -0,0 +1,17 @@
+// Copyright (c) 2009 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/http/http_response_info.h"
+
+#include "net/http/http_response_headers.h"
+
+namespace net {
+
+HttpResponseInfo::HttpResponseInfo() {
+}
+
+HttpResponseInfo::~HttpResponseInfo() {
+}
+
+}  // namespace net
diff --git a/net/http/http_response_info.h b/net/http/http_response_info.h
index 5563ada..671a390 100644
--- a/net/http/http_response_info.h
+++ b/net/http/http_response_info.h
@@ -2,19 +2,23 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_HTTP_HTTP_RESPONSE_INFO_H__
-#define NET_HTTP_HTTP_RESPONSE_INFO_H__
+#ifndef NET_HTTP_HTTP_RESPONSE_INFO_H_
+#define NET_HTTP_HTTP_RESPONSE_INFO_H_
 
 #include "base/time.h"
 #include "net/base/auth.h"
 #include "net/base/ssl_info.h"
-#include "net/http/http_response_headers.h"
 #include "net/http/http_vary_data.h"
 
 namespace net {
 
+class HttpResponseHeaders;
+
 class HttpResponseInfo {
  public:
+  HttpResponseInfo();
+  ~HttpResponseInfo();
+
   // The following is only defined if the request_time memmber is set.
   // If this response was resurrected from cache, then this bool is set, and
   // request_time may corresponds to a time "far" in the past.  Note that
@@ -48,5 +52,4 @@ class HttpResponseInfo {
 
 }  // namespace net
 
-#endif  // NET_HTTP_HTTP_RESPONSE_INFO_H__
-
+#endif  // NET_HTTP_HTTP_RESPONSE_INFO_H_
diff --git a/net/http/http_transaction_unittest.h b/net/http/http_transaction_unittest.h
index 9ef6bf8..e530423 100644
--- a/net/http/http_transaction_unittest.h
+++ b/net/http/http_transaction_unittest.h
@@ -20,6 +20,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_request_info.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 
 //-----------------------------------------------------------------------------
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index 37df32e..553c9db 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -52,6 +52,7 @@
 		04C626D80E8DE3AA0067E92A /* http_auth_handler_basic_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04C626D70E8DE3AA0067E92A /* http_auth_handler_basic_unittest.cc */; };
 		04C626DA0E8DE3BA0067E92A /* http_auth_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04C626D90E8DE3BA0067E92A /* http_auth_unittest.cc */; };
 		04E7BD550EC4ECF60078FE58 /* http_auth_cache.cc in Sources */ = {isa = PBXBuildFile; fileRef = 04E7BD540EC4ECF60078FE58 /* http_auth_cache.cc */; };
+		3853286C2A6C0BE6E1113FA2 /* client_socket.cc in Sources */ = {isa = PBXBuildFile; fileRef = 2C481A2E21097E841607B968 /* client_socket.cc */; };
 		4D4C5BE20EF1B89E002CA805 /* directory_lister_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED325A0E5A181C00A747DB /* directory_lister_unittest.cc */; };
 		4D4C5C060EF1B8C5002CA805 /* filter_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 4D4C5C050EF1B8C5002CA805 /* filter_unittest.cc */; };
 		4D4C5C070EF1B915002CA805 /* http_cache_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33550E5A194700A747DB /* http_cache_unittest.cc */; };
@@ -134,6 +135,7 @@
 		7BED34190E5A1A8600A747DB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BA04540E25613300BE02C6 /* libnet.a */; };
 		7BED34450E5A1A9600A747DB /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED324A0E5A17C000A747DB /* libbase.a */; };
 		7BED34520E5A1ABC00A747DB /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED32530E5A17C300A747DB /* libgtest.a */; };
+		81C766A4F7089E3ED5BD33A4 /* addr.cc in Sources */ = {isa = PBXBuildFile; fileRef = D7745B2B51F48114C05EB14A /* addr.cc */; };
 		8200F2030E5F741E005A3C44 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8200F2020E5F741E005A3C44 /* CoreServices.framework */; };
 		820701040EB6611F005CD9E7 /* proxy_resolver_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 820701020EB6611F005CD9E7 /* proxy_resolver_mac.cc */; };
 		820706940EB8D9D4005CD9E7 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 820706930EB8D9D4005CD9E7 /* SystemConfiguration.framework */; };
@@ -159,6 +161,7 @@
 		827E139D0E81611D00183614 /* x509_certificate_mac.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32800E5A181C00A747DB /* x509_certificate_mac.cc */; };
 		82ECB3090E5B651D00A913E3 /* mime_sniffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AD0E5A181C00A747DB /* mime_sniffer.cc */; };
 		93D11DCE0E91463000C36437 /* file_stream_posix.cc in Sources */ = {isa = PBXBuildFile; fileRef = 93D11DCD0E91463000C36437 /* file_stream_posix.cc */; };
+		A2420E59B0E92F1C5DF8FE67 /* io_buffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = D67E592A64772BE82718FD4C /* io_buffer.cc */; };
 		A50055BF0EBF7CB2007B0A90 /* telnet_server_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED328B0E5A181C00A747DB /* telnet_server_unittest.cc */; };
 		A50055C00EBF7CD6007B0A90 /* listen_socket_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32B10E5A181C00A747DB /* listen_socket_unittest.cc */; };
 		A50055FE0EBF800D007B0A90 /* telnet_server.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED328D0E5A181C00A747DB /* telnet_server.cc */; };
@@ -186,6 +189,7 @@
 		E4CE9C260E8C027900D5378C /* http_network_layer_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED335C0E5A194700A747DB /* http_network_layer_unittest.cc */; };
 		E4CE9C2E0E8C02ED00D5378C /* http_transaction_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED334A0E5A194700A747DB /* http_transaction_unittest.cc */; };
 		E4CE9C380E8C035C00D5378C /* http_network_transaction_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED33590E5A194700A747DB /* http_network_transaction_unittest.cc */; };
+		E51639B07E0FC884891C5135 /* http_response_info.cc in Sources */ = {isa = PBXBuildFile; fileRef = AD46F9C0118A7D723526A361 /* http_response_info.cc */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -442,6 +446,7 @@
 		04E7BD560EC4ED020078FE58 /* http_auth_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = http_auth_cache.h; sourceTree = "<group>"; };
 		0E81748E2B2E8B814DBB78EC /* ftp_auth_cache.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ftp_auth_cache.cc; path = ftp/ftp_auth_cache.cc; sourceTree = SOURCE_ROOT; };
 		15C6370BF6FE62308A559648 /* ftp_auth_cache_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ftp_auth_cache_unittest.cc; path = ftp/ftp_auth_cache_unittest.cc; sourceTree = SOURCE_ROOT; };
+		2C481A2E21097E841607B968 /* client_socket.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = client_socket.cc; sourceTree = "<group>"; };
 		4D4C5C050EF1B8C5002CA805 /* filter_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = filter_unittest.cc; sourceTree = "<group>"; };
 		533102E60E5E3EBF00FF8E32 /* net_util_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = net_util_posix.cc; sourceTree = "<group>"; };
 		58586B4C2F020D851B930BF2 /* cert_verify_result.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cert_verify_result.h; sourceTree = "<group>"; };
@@ -689,9 +694,12 @@
 		93D11DCD0E91463000C36437 /* file_stream_posix.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_stream_posix.cc; sourceTree = "<group>"; };
 		A5AB7BFB0EB7DBA10070A7D3 /* file_stream_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = file_stream_unittest.cc; sourceTree = "<group>"; };
 		ACAB6D5C0F43A727D039E138 /* ftp_auth_cache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ftp_auth_cache.h; path = ftp/ftp_auth_cache.h; sourceTree = SOURCE_ROOT; };
+		AD46F9C0118A7D723526A361 /* http_response_info.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = http_response_info.cc; sourceTree = "<group>"; };
 		B87DD6154A7A9ED60F28F016 /* cert_verifier.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cert_verifier.cc; sourceTree = "<group>"; };
 		C081BA94B2F59669BFAFD808 /* cert_status_flags.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cert_status_flags.cc; sourceTree = "<group>"; };
 		D4726BC70CCE10F4FF2A5E12 /* connection_type_histograms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = connection_type_histograms.h; sourceTree = "<group>"; };
+		D67E592A64772BE82718FD4C /* io_buffer.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = io_buffer.cc; sourceTree = "<group>"; };
+		D7745B2B51F48114C05EB14A /* addr.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = addr.cc; sourceTree = "<group>"; };
 		DD0B3349460AB0703FCE0C7A /* cert_verifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cert_verifier.h; sourceTree = "<group>"; };
 		DFC96EF80EF9BC5D003C335B /* eviction.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eviction.cc; sourceTree = "<group>"; };
 		DFC96EF90EF9BC5D003C335B /* eviction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = eviction.h; sourceTree = "<group>"; };
@@ -904,6 +912,7 @@
 				B87DD6154A7A9ED60F28F016 /* cert_verifier.cc */,
 				DD0B3349460AB0703FCE0C7A /* cert_verifier.h */,
 				58586B4C2F020D851B930BF2 /* cert_verify_result.h */,
+				2C481A2E21097E841607B968 /* client_socket.cc */,
 				7BED32710E5A181C00A747DB /* client_socket.h */,
 				7BED32700E5A181C00A747DB /* client_socket_factory.cc */,
 				7BED326F0E5A181C00A747DB /* client_socket_factory.h */,
@@ -950,6 +959,7 @@
 				7BED32B40E5A181C00A747DB /* host_resolver.h */,
 				7B82FF450E763620008F45CF /* host_resolver_unittest.cc */,
 				7BA3615D0E8C35A50023C8B9 /* host_resolver_unittest.h */,
+				D67E592A64772BE82718FD4C /* io_buffer.cc */,
 				7BED32B30E5A181C00A747DB /* listen_socket.cc */,
 				7BED32B20E5A181C00A747DB /* listen_socket.h */,
 				7BED32B10E5A181C00A747DB /* listen_socket_unittest.cc */,
@@ -1017,6 +1027,7 @@
 		7BED32D30E5A18E800A747DB /* disk_cache */ = {
 			isa = PBXGroup;
 			children = (
+				D7745B2B51F48114C05EB14A /* addr.cc */,
 				7BED32F50E5A190600A747DB /* addr.h */,
 				7BED32EE0E5A190600A747DB /* addr_unittest.cc */,
 				7BED32EB0E5A190600A747DB /* backend_impl.cc */,
@@ -1107,6 +1118,7 @@
 				7BED33440E5A194700A747DB /* http_response_headers.cc */,
 				7BED334D0E5A194700A747DB /* http_response_headers.h */,
 				7BED33480E5A194700A747DB /* http_response_headers_unittest.cc */,
+				AD46F9C0118A7D723526A361 /* http_response_info.cc */,
 				7BED33450E5A194700A747DB /* http_response_info.h */,
 				7BED33650E5A194700A747DB /* http_transaction.h */,
 				7BED33530E5A194700A747DB /* http_transaction_factory.h */,
@@ -1471,6 +1483,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				81C766A4F7089E3ED5BD33A4 /* addr.cc in Sources */,
 				7B8503E90E5B2D4700730B43 /* address_list.cc in Sources */,
 				7B8503EA0E5B2D4F00730B43 /* backend_impl.cc in Sources */,
 				7BA015440E5A1BFA00044150 /* base64.cc in Sources */,
@@ -1479,6 +1492,7 @@
 				7B8504050E5B2DBD00730B43 /* cache_util_posix.cc in Sources */,
 				7BCF4CF2ECABD68C18FA59F7 /* cert_status_flags.cc in Sources */,
 				B07E3550EFE4B6C6680D49BE /* cert_verifier.cc in Sources */,
+				3853286C2A6C0BE6E1113FA2 /* client_socket.cc in Sources */,
 				E4CE9C0D0E8BFFFA00D5378C /* client_socket_factory.cc in Sources */,
 				7B8504080E5B2DD800730B43 /* client_socket_handle.cc in Sources */,
 				7B8504090E5B2DD800730B43 /* client_socket_pool.cc in Sources */,
@@ -1511,8 +1525,10 @@
 				E49DD3290E893336003C7A87 /* http_network_layer.cc in Sources */,
 				E4CE9BC50E8BF92400D5378C /* http_network_transaction.cc in Sources */,
 				821F21300E5CD746003C7E38 /* http_response_headers.cc in Sources */,
+				E51639B07E0FC884891C5135 /* http_response_info.cc in Sources */,
 				7B85042F0E5B2E4900730B43 /* http_util.cc in Sources */,
 				821F207F0E5CD3C6003C7E38 /* http_vary_data.cc in Sources */,
+				A2420E59B0E92F1C5DF8FE67 /* io_buffer.cc in Sources */,
 				A50055FF0EBF8018007B0A90 /* listen_socket.cc in Sources */,
 				7B8504320E5B2E4900730B43 /* mapped_file_posix.cc in Sources */,
 				7B8504330E5B2E4900730B43 /* mem_backend_impl.cc in Sources */,
diff --git a/net/net_lib.scons b/net/net_lib.scons
index 5f2f3f0..dfc5c71 100644
--- a/net/net_lib.scons
+++ b/net/net_lib.scons
@@ -31,6 +31,7 @@ input_files = ChromeFileList([
     'base/cert_verifier.cc',
     'base/cert_verifier.h',
     'base/cert_verify_result.h',
+    'base/client_socket.cc',
     'base/client_socket.h',
     'base/client_socket_factory.cc',
     'base/client_socket_factory.h',
@@ -66,6 +67,7 @@ input_files = ChromeFileList([
     'base/gzip_header.h',
     'base/host_resolver.cc',
     'base/host_resolver.h',
+    'base/io_buffer.cc',
     'base/io_buffer.h',
     'base/listen_socket.cc',
     'base/listen_socket.h',
@@ -180,6 +182,7 @@ input_files = ChromeFileList([
     'http/http_request_info.h',
     'http/http_response_headers.cc',
     'http/http_response_headers.h',
+    'http/http_response_info.cc',
     'http/http_response_info.h',
     'http/http_transaction.h',
     'http/http_transaction_factory.h',
@@ -189,6 +192,7 @@ input_files = ChromeFileList([
     'http/http_vary_data.h',
   ]),
   MSVSFilter('disk_cache', [
+    'disk_cache/addr.cc',
     'disk_cache/addr.h',
     'disk_cache/backend_impl.cc',
     'disk_cache/backend_impl.h',
diff --git a/net/url_request/mime_sniffer_proxy.cc b/net/url_request/mime_sniffer_proxy.cc
index 3a8d9a9..6a6b6e9 100644
--- a/net/url_request/mime_sniffer_proxy.cc
+++ b/net/url_request/mime_sniffer_proxy.cc
@@ -4,6 +4,7 @@
 
 #include "net/url_request/mime_sniffer_proxy.h"
 
+#include "net/base/io_buffer.h"
 #include "net/base/mime_sniffer.h"
 
 static const int kBufferSize = 1024;
diff --git a/net/url_request/mime_sniffer_proxy.h b/net/url_request/mime_sniffer_proxy.h
index 898ea60..7d2eba8 100644
--- a/net/url_request/mime_sniffer_proxy.h
+++ b/net/url_request/mime_sniffer_proxy.h
@@ -22,9 +22,12 @@
 #ifndef NET_URL_REQUEST_MIME_SNIFFER_PROXY_H_
 #define NET_URL_REQUEST_MIME_SNIFFER_PROXY_H_
 
-#include "net/base/io_buffer.h"
 #include "net/url_request/url_request.h"
 
+namespace net {
+class IOBuffer;
+}
+
 class MimeSnifferProxy : public URLRequest::Delegate {
  public:
   // The constructor inserts this MimeSnifferProxy in between the URLRequest
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 0a510d8..fefd24c 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -4,17 +4,17 @@
 
 #include "net/url_request/url_request.h"
 
-#include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/singleton.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/upload_data.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_job.h"
 #include "net/url_request/url_request_job_manager.h"
 
@@ -101,6 +101,19 @@ void URLRequest::AppendFileRangeToUpload(const wstring& file_path,
   upload_->AppendFileRange(file_path, offset, length);
 }
 
+void URLRequest::set_upload(net::UploadData* upload) {
+  upload_ = upload;
+}
+
+// Get the upload data directly.
+net::UploadData* URLRequest::get_upload() {
+  return upload_.get();
+}
+
+bool URLRequest::has_upload() const {
+  return upload_ != NULL;
+}
+
 void URLRequest::SetExtraRequestHeaderById(int id, const string& value,
                                            bool overwrite) {
   DCHECK(!is_pending_);
@@ -171,6 +184,10 @@ void URLRequest::GetAllResponseHeaders(string* headers) {
   }
 }
 
+net::HttpResponseHeaders* URLRequest::response_headers() const {
+  return response_info_.headers.get();
+}
+
 bool URLRequest::GetResponseCookies(ResponseCookies* cookies) {
   DCHECK(job_);
   return job_->GetResponseCookies(cookies);
@@ -206,6 +223,21 @@ bool URLRequest::IsHandledURL(const GURL& url) {
   return IsHandledProtocol(url.scheme());
 }
 
+void URLRequest::set_policy_url(const GURL& policy_url) {
+  DCHECK(!is_pending_);
+  policy_url_ = policy_url;
+}
+
+void URLRequest::set_method(const std::string& method) {
+  DCHECK(!is_pending_);
+  method_ = method;
+}
+
+void URLRequest::set_referrer(const std::string& referrer) {
+  DCHECK(!is_pending_);
+  referrer_ = referrer;
+}
+
 void URLRequest::Start() {
   DCHECK(!is_pending_);
   DCHECK(!job_);
@@ -377,6 +409,14 @@ int URLRequest::Redirect(const GURL& location, int http_status_code) {
   return net::OK;
 }
 
+URLRequestContext* URLRequest::context() {
+  return context_.get();
+}
+
+void URLRequest::set_context(URLRequestContext* context) {
+  context_ = context;
+}
+
 int64 URLRequest::GetExpectedContentSize() const {
   int64 expected_content_size = -1;
   if (job_)
@@ -384,3 +424,12 @@ int64 URLRequest::GetExpectedContentSize() const {
 
   return expected_content_size;
 }
+
+#ifndef NDEBUG
+
+URLRequestMetrics::~URLRequestMetrics() {
+  DLOG_IF(WARNING, object_count != 0) <<
+    "Leaking " << object_count << " URLRequest object(s)";
+}
+
+#endif
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 008d304..f4aee3a 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -8,22 +8,22 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_states.h"
-#include "net/base/ssl_info.h"
-#include "net/base/upload_data.h"
-#include "net/base/x509_certificate.h"
 #include "net/http/http_response_info.h"
-#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_status.h"
 
 namespace net {
+
 class IOBuffer;
+class UploadData;
+class X509Certificate;
+
 }
+
+class URLRequestContext;
 class URLRequestJob;
 
 // This stores the values of the Set-Cookie headers received during the request.
@@ -203,29 +203,20 @@ class URLRequest {
   // The URL that should be consulted for the third-party cookie blocking
   // policy.
   const GURL& policy_url() const { return policy_url_; }
-  void set_policy_url(const GURL& policy_url) {
-    DCHECK(!is_pending_);
-    policy_url_ = policy_url;
-  }
+  void set_policy_url(const GURL& policy_url);
 
   // The request method, as an uppercase string.  "GET" is the default value.
   // The request method may only be changed before Start() is called and
   // should only be assigned an uppercase value.
   const std::string& method() const { return method_; }
-  void set_method(const std::string& method) {
-    DCHECK(!is_pending_);
-    method_ = method;
-  }
+  void set_method(const std::string& method);
 
   // The referrer URL for the request.  This header may actually be suppressed
   // from the underlying network request for security reasons (e.g., a HTTPS
   // URL will not be sent as the referrer for a HTTP request).  The referrer
   // may only be changed before Start() is called.
   const std::string& referrer() const { return referrer_; }
-  void set_referrer(const std::string& referrer) {
-    DCHECK(!is_pending_);
-    referrer_ = referrer;
-  }
+  void set_referrer(const std::string& referrer);
 
   // The delegate of the request.  This value may be changed at any time,
   // and it is permissible for it to be null.
@@ -250,13 +241,13 @@ class URLRequest {
   }
 
   // Set the upload data directly.
-  void set_upload(net::UploadData* upload) { upload_ = upload; }
+  void set_upload(net::UploadData* upload);
 
   // Get the upload data directly.
-  net::UploadData* get_upload() { return upload_.get(); }
+  net::UploadData* get_upload();
 
   // Returns true if the request has a non-empty message body to upload.
-  bool has_upload() const { return upload_ != NULL; }
+  bool has_upload() const;
 
   // Set an extra request header by ID or name.  These methods may only be
   // called before Start() is called.  It is an error to call it later.
@@ -309,9 +300,7 @@ class URLRequest {
 
   // Get all response headers, as a HttpResponseHeaders object.  See comments
   // in HttpResponseHeaders class as to the format of the data.
-  net::HttpResponseHeaders* response_headers() const {
-    return response_info_.headers.get();
-  }
+  net::HttpResponseHeaders* response_headers() const;
 
   // Get the SSL connection info.
   const net::SSLInfo& ssl_info() const {
@@ -421,8 +410,8 @@ class URLRequest {
   void set_enable_profiling(bool profiling) { enable_profiling_ = profiling; }
 
   // Used to specify the context (cookie store, cache) for this request.
-  URLRequestContext* context() { return context_.get(); }
-  void set_context(URLRequestContext* context) { context_ = context; }
+  URLRequestContext* context();
+  void set_context(URLRequestContext* context);
 
   // Returns the expected content size if available
   int64 GetExpectedContentSize() const;
@@ -497,7 +486,7 @@ class URLRequest {
   // first transaction in a request involving redirects.
   uint64 final_upload_progress_;
 
-  DISALLOW_EVIL_CONSTRUCTORS(URLRequest);
+  DISALLOW_COPY_AND_ASSIGN(URLRequest);
 };
 
 //-----------------------------------------------------------------------------
@@ -510,10 +499,7 @@ class URLRequest {
 struct URLRequestMetrics {
   int object_count;
   URLRequestMetrics() : object_count(0) {}
-  ~URLRequestMetrics() {
-    DLOG_IF(WARNING, object_count != 0) <<
-      "Leaking " << object_count << " URLRequest object(s)";
-  }
+  ~URLRequestMetrics();
 };
 
 extern URLRequestMetrics url_request_metrics;
@@ -526,8 +512,6 @@ extern URLRequestMetrics url_request_metrics;
 #define URLREQUEST_COUNT_CTOR()
 #define URLREQUEST_COUNT_DTOR()
 
-#endif
-
+#endif  // #ifndef NDEBUG
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_H_
-
diff --git a/net/url_request/url_request_context.h b/net/url_request/url_request_context.h
index f439482..ba2a11c 100644
--- a/net/url_request/url_request_context.h
+++ b/net/url_request/url_request_context.h
@@ -15,9 +15,9 @@
 #include "base/string_util.h"
 #include "net/base/cookie_policy.h"
 #include "net/ftp/ftp_auth_cache.h"
-#include "net/http/http_transaction_factory.h"
 
 namespace net {
+class HttpTransactionFactory;
 class CookieMonster;
 class ProxyService;
 }
diff --git a/net/url_request/url_request_error_job.cc b/net/url_request/url_request_error_job.cc
index b065b3c..032d495 100644
--- a/net/url_request/url_request_error_job.cc
+++ b/net/url_request/url_request_error_job.cc
@@ -6,6 +6,7 @@
 
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/url_request_status.h"
 
 URLRequestErrorJob::URLRequestErrorJob(URLRequest* request, int error)
     : URLRequestJob(request), error_(error) {
diff --git a/net/url_request/url_request_file_job.h b/net/url_request/url_request_file_job.h
index 0ccaa5a..3aff74b 100644
--- a/net/url_request/url_request_file_job.h
+++ b/net/url_request/url_request_file_job.h
@@ -20,7 +20,7 @@ class URLRequestFileJob : public URLRequestJob {
 
   virtual void Start();
   virtual void Kill();
-  virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read);
+  virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int* bytes_read);
   virtual bool IsRedirectResponse(GURL* location, int* http_status_code);
   virtual bool GetMimeType(std::string* mime_type);
 
diff --git a/net/url_request/url_request_filter.cc b/net/url_request/url_request_filter.cc
index b3040da..f52855e 100644
--- a/net/url_request/url_request_filter.cc
+++ b/net/url_request/url_request_filter.cc
@@ -6,6 +6,8 @@
 
 #include <set>
 
+#include "base/logging.h"
+
 URLRequestFilter* URLRequestFilter::shared_instance_ = NULL;
 
 /* static */
diff --git a/net/url_request/url_request_ftp_job.cc b/net/url_request/url_request_ftp_job.cc
index 465217d..cf41f11 100644
--- a/net/url_request/url_request_ftp_job.cc
+++ b/net/url_request/url_request_ftp_job.cc
@@ -15,6 +15,7 @@
 #include "net/base/net_util.h"
 #include "net/base/wininet_util.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/base/escape.h"
 
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index e7e8b20..0f65534 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -17,10 +17,12 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/sdch_manager.h"
+#include "net/http/http_response_headers.h"
 #include "net/http/http_response_info.h"
 #include "net/http/http_transaction.h"
 #include "net/http/http_transaction_factory.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 
 // TODO(darin): make sure the port blocking code is not lost
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index a77d462..53d46f4 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -5,10 +5,10 @@
 #ifndef NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_HTTP_JOB_H_
 
-#include <string>
 #include <vector>
 
 #include "base/scoped_ptr.h"
+#include "net/base/auth.h"
 #include "net/base/completion_callback.h"
 #include "net/http/http_request_info.h"
 #include "net/url_request/url_request_job.h"
diff --git a/net/url_request/url_request_inet_job.cc b/net/url_request/url_request_inet_job.cc
index ccf1a77..f5fb9db 100644
--- a/net/url_request/url_request_inet_job.cc
+++ b/net/url_request/url_request_inet_job.cc
@@ -13,6 +13,7 @@
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/wininet_util.h"
+#include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_error_job.h"
 #include "net/url_request/url_request_ftp_job.h"
 #include "net/url_request/url_request_job_metrics.h"
diff --git a/net/url_request/url_request_job.h b/net/url_request/url_request_job.h
index 0a5744b..d9729fe 100644
--- a/net/url_request/url_request_job.h
+++ b/net/url_request/url_request_job.h
@@ -8,14 +8,12 @@
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/ref_counted.h"
-#include "net/base/auth.h"
 #include "net/base/filter.h"
 #include "net/base/load_states.h"
-#include "net/url_request/url_request_status.h"
 
 namespace net {
+class AuthChallengeInfo;
 class HttpResponseInfo;
 class IOBuffer;
 class UploadData;
@@ -23,6 +21,7 @@ class UploadData;
 
 class GURL;
 class URLRequest;
+class URLRequestStatus;
 class URLRequestJobMetrics;
 
 // The URLRequestJob is using RefCounterThreadSafe because some sub classes
@@ -201,13 +200,13 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> {
   void NotifyReadComplete(int bytes_read);
 
   // Notifies the request that a start error has occurred.
-  void NotifyStartError(const URLRequestStatus &status);
+  void NotifyStartError(const URLRequestStatus& status);
 
   // NotifyDone marks when we are done with a request.  It is really
   // a glorified set_status, but also does internal state checking and
   // job tracking.  It should be called once per request, when the job is
   // finished doing all IO.
-  void NotifyDone(const URLRequestStatus &status);
+  void NotifyDone(const URLRequestStatus& status);
 
   // Some work performed by NotifyDone must be completed on a separate task
   // so as to avoid re-entering the delegate.  This method exists to perform
@@ -251,7 +250,7 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> {
   const URLRequestStatus GetStatus();
 
   // Set the status of the job.
-  void SetStatus(const URLRequestStatus &status);
+  void SetStatus(const URLRequestStatus& status);
 
   // Whether the job is doing performance profiling
   bool is_profiling_;
@@ -304,4 +303,3 @@ class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob> {
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_
-
diff --git a/net/url_request/url_request_simple_job.cc b/net/url_request/url_request_simple_job.cc
index a4ef4e1..8f684ab 100644
--- a/net/url_request/url_request_simple_job.cc
+++ b/net/url_request/url_request_simple_job.cc
@@ -6,6 +6,7 @@
 
 #include "base/message_loop.h"
 #include "net/base/net_errors.h"
+#include "net/url_request/url_request_status.h"
 
 URLRequestSimpleJob::URLRequestSimpleJob(URLRequest* request)
     : URLRequestJob(request),
diff --git a/net/url_request/url_request_simple_job.h b/net/url_request/url_request_simple_job.h
index 183598a..87dbcb1 100644
--- a/net/url_request/url_request_simple_job.h
+++ b/net/url_request/url_request_simple_job.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H__
-#define NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_SIMPLE_JOB_H_
 
-#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_job.h"
 
+class URLRequest;
+
 class URLRequestSimpleJob : public URLRequestJob {
  public:
   URLRequestSimpleJob(URLRequest* request);
@@ -32,5 +33,4 @@ class URLRequestSimpleJob : public URLRequestJob {
   int data_offset_;
 };
 
-#endif  // NET_URL_REQUEST_URL_REQUEST_DATA_JOB_H__
-
+#endif  // NET_URL_REQUEST_URL_REQUEST_DATA_JOB_H_
diff --git a/net/url_request/url_request_test_job.cc b/net/url_request/url_request_test_job.cc
index baefc3d..fce29fd 100644
--- a/net/url_request/url_request_test_job.cc
+++ b/net/url_request/url_request_test_job.cc
@@ -9,6 +9,7 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "net/base/net_errors.h"
+#include "net/http/http_response_headers.h"
 #include "net/url_request/url_request.h"
 
 // This emulates the global message loop for the test URL request class, since
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index 21d1c72..5ba7165 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -29,6 +29,7 @@
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
 #include "net/http/http_network_layer.h"
+#include "net/http/http_response_headers.h"
 #include "net/proxy/proxy_service.h"
 #include "net/url_request/url_request.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/net/url_request/url_request_unittest.h b/net/url_request/url_request_unittest.h
index 7107d50..0351382 100644
--- a/net/url_request/url_request_unittest.h
+++ b/net/url_request/url_request_unittest.h
@@ -25,6 +25,7 @@
 #include "net/base/net_errors.h"
 #include "net/http/http_network_layer.h"
 #include "net/url_request/url_request.h"
+#include "net/url_request/url_request_context.h"
 #include "net/proxy/proxy_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/url_util.h"
diff --git a/net/url_request/url_request_view_cache_job.cc b/net/url_request/url_request_view_cache_job.cc
index 0cd4efd..0c6aba2 100644
--- a/net/url_request/url_request_view_cache_job.cc
+++ b/net/url_request/url_request_view_cache_job.cc
@@ -8,7 +8,8 @@
 #include "net/base/escape.h"
 #include "net/disk_cache/disk_cache.h"
 #include "net/http/http_cache.h"
-#include "net/http/http_response_info.h"
+#include "net/http/http_response_headers.h"
+#include "net/url_request/url_request_context.h"
 
 #define VIEW_CACHE_HEAD \
   "<html><body><table>"
diff --git a/net/url_request/url_request_view_cache_job.h b/net/url_request/url_request_view_cache_job.h
index 5cf6c36..e85d273 100644
--- a/net/url_request/url_request_view_cache_job.h
+++ b/net/url_request/url_request_view_cache_job.h
@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H__
-#define NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H__
+#ifndef NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H_
+#define NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H_
 
+#include "net/url_request/url_request.h"
 #include "net/url_request/url_request_simple_job.h"
 
 namespace disk_cache {
@@ -28,5 +29,4 @@ class URLRequestViewCacheJob : public URLRequestSimpleJob {
   disk_cache::Backend* GetDiskCache() const;
 };
 
-#endif  // NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H__
-
+#endif  // NET_URL_REQUEST_URL_REQUEST_VIEW_CACHE_JOB_H_