Merge r21417 to 172....

net/url_request/url_request_job.h

Index: net/url_request/url_request_job.h
===================================================================
--- net/url_request/url_request_job.h	(revision 23600)
+++ net/url_request/url_request_job.h	(working copy)
@@ -10,6 +10,7 @@
 
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "googleurl/src/gurl.h"
 #include "net/base/filter.h"
 #include "net/base/load_states.h"
 
@@ -20,7 +21,6 @@
 class UploadData;
 }
 
-class GURL;
 class URLRequest;
 class URLRequestStatus;
 class URLRequestJobMetrics;
@@ -171,6 +171,8 @@
   // Continue processing the request ignoring the last error.
   virtual void ContinueDespiteLastError();
 
+  void FollowDeferredRedirect();
+
   // Returns true if the Job is done producing response data and has called
   // NotifyDone on the request.
   bool is_done() const { return done_; }
@@ -320,6 +322,9 @@
   // Expected content size
   int64 expected_content_size_;
 
+  // Set when a redirect is deferred.
+  GURL deferred_redirect_url_;
+  int deferred_redirect_status_code_;
   // Total number of bytes read from network (or cache) and and typically handed
   // to filter to process.  Used to histogram compression ratios, and error
   // recovery scenarios in filters.