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

20 files changed, 104 insertions, 57 deletions

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_