Merge r21417 to 172....

net/url_request/url_request_job.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_JOB_H_
 #define NET_URL_REQUEST_URL_REQUEST_JOB_H_
 
 #include <string>
 #include <vector>
 
 #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"
 
 namespace net {
 class AuthChallengeInfo;
 class HttpResponseInfo;
 class IOBuffer;
 class UploadData;
 }
 
-class GURL;
 class URLRequest;
 class URLRequestStatus;
 class URLRequestJobMetrics;
 
 // The URLRequestJob is using RefCounterThreadSafe because some sub classes
 // can be destroyed on multiple threads. This is the case of the
 // UrlRequestFileJob.
 class URLRequestJob : public base::RefCountedThreadSafe<URLRequestJob>,
                       public FilterContext {
  public:
@@ skipping 130 matching lines @@
   // Resend the request with authentication credentials.
   virtual void SetAuth(const std::wstring& username,
                        const std::wstring& password);
 
   // Display the error page without asking for credentials again.
   virtual void CancelAuth();
 
   // 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_; }
 
   // Returns true if the job is doing performance profiling
   bool is_profiling() const { return is_profiling_; }
 
   // Retrieve the performance measurement of the job. The data is encapsulated
   // with a URLRequestJobMetrics object. The caller owns this object from now
   // on.
@@ skipping 129 matching lines @@
   net::IOBuffer *read_buffer_;
   int read_buffer_len_;
 
   // Used by HandleResponseIfNecessary to track whether we've sent the
   // OnResponseStarted callback and potentially redirect callbacks as well.
   bool has_handled_response_;
 
   // 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.
   int64 filter_input_byte_count_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestJob);
 };
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_JOB_H_