Revert of Move ResourceHandler deferred actions ahead of external protocol handling.

content/browser/loader/resource_loader.h

 // Copyright (c) 2012 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 CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
 #define CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_
 
 #include <memory>
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/loader/resource_controller.h"
 #include "content/browser/ssl/ssl_client_auth_handler.h"
 #include "content/browser/ssl/ssl_error_handler.h"
 #include "content/common/content_export.h"
 #include "net/url_request/url_request.h"
-#include "url/gurl.h"
 
 namespace net {
 class X509Certificate;
 }
 
 namespace content {
 class ResourceDispatcherHostLoginDelegate;
 class ResourceHandler;
 class ResourceLoaderDelegate;
 class ResourceRequestInfoImpl;
@@ skipping 47 matching lines @@
   void CancelCertificateSelection() override;
 
   // ResourceController implementation:
   void Resume() override;
   void Cancel() override;
   void CancelAndIgnore() override;
   void CancelWithError(int error_code) override;
 
   void StartRequestInternal();
   void CancelRequestInternal(int error, bool from_renderer);
-  void FollowDeferredRedirectInternal();
   void CompleteResponseStarted();
   void ReadMore(bool is_continuation);
   void ResumeReading();
   // Passes a read result to the handler.
   void CompleteRead(int bytes_read);
   void ResponseCompleted();
   void CallDidFinishLoading();
   void RecordHistograms();
 
   bool is_deferred() const { return deferred_stage_ != DEFERRED_NONE; }
@@ skipping 36 matching lines @@
 
   // Called when a navigation has finished transfer.
   base::Closure on_transfer_complete_callback_;
 
   // Instrumentation add to investigate http://crbug.com/503306.
   // TODO(mmenke): Remove once bug is fixed.
   int times_cancelled_before_request_start_;
   bool started_request_;
   int times_cancelled_after_request_start_;
 
-  // Stores the URL from a deferred redirect.
-  GURL deferred_redirect_url_;
-
   base::WeakPtrFactory<ResourceLoader> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_RESOURCE_LOADER_H_