Merge r21417 to 172....

net/proxy/proxy_script_fetcher.cc

 // Copyright (c) 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.
 
 #include "net/proxy/proxy_script_fetcher.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/string_util.h"
@@ skipping 33 matching lines @@
   virtual void Fetch(const GURL& url, std::string* bytes,
                      CompletionCallback* callback);
   virtual void Cancel();
 
   // URLRequest::Delegate methods:
 
   virtual void OnAuthRequired(URLRequest* request,
                               AuthChallengeInfo* auth_info);
   virtual void OnSSLCertificateError(URLRequest* request, int cert_error,
                                      X509Certificate* cert);
-  virtual void OnReceivedRedirect(URLRequest* request, const GURL& to_url);
   virtual void OnResponseStarted(URLRequest* request);
   virtual void OnReadCompleted(URLRequest* request, int num_bytes);
   virtual void OnResponseCompleted(URLRequest* request);
 
  private:
   // Read more bytes from the response.
   void ReadBody(URLRequest* request);
 
   // Called once the request has completed to notify the caller of
   // |response_code_| and |response_bytes_|.
@@ skipping 106 matching lines @@
 
 void ProxyScriptFetcherImpl::OnSSLCertificateError(URLRequest* request,
                                                    int cert_error,
                                                    X509Certificate* cert) {
   DCHECK(request == cur_request_.get());
   // Certificate errors are in same space as net errors.
   result_code_ = cert_error;
   request->Cancel();
 }
 
-void ProxyScriptFetcherImpl::OnReceivedRedirect(URLRequest* request,
-                                                const GURL& to_url) {
-  DCHECK(request == cur_request_.get());
-  // OK, thanks for telling.
-}
-
 void ProxyScriptFetcherImpl::OnResponseStarted(URLRequest* request) {
   DCHECK(request == cur_request_.get());
 
   if (!request->status().is_success()) {
     OnResponseCompleted(request);
     return;
   }
 
   // Require HTTP responses to have a success status code.
   if (request->url().SchemeIs("http") || request->url().SchemeIs("https")) {
@@ skipping 98 matching lines @@
 }
 
 // static
 size_t ProxyScriptFetcher::SetSizeConstraintForUnittest(size_t size_bytes) {
   size_t prev = max_response_bytes;
   max_response_bytes = size_bytes;
   return prev;
 }
 
 }  // namespace net