Move MimeTypeResourceHandler before ThrottlingResourceHandler

content/browser/loader/mime_type_resource_handler.h

Index: content/browser/loader/mime_type_resource_handler.h
diff --git a/content/browser/loader/mime_type_resource_handler.h b/content/browser/loader/mime_type_resource_handler.h
index f5581a6a8072522363e1f61e1030129b3ec9d4f2..ae908a42e541222f48da6a437319dbc38d77cf2c 100644
--- a/content/browser/loader/mime_type_resource_handler.h
+++ b/content/browser/loader/mime_type_resource_handler.h
@@ -10,9 +10,8 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "content/browser/loader/layered_resource_handler.h"
+#include "content/browser/loader/buffered_resource_handler.h"
 #include "content/common/content_export.h"
-#include "content/public/browser/resource_controller.h"
 
 namespace net {
 class URLRequest;
@@ -38,9 +37,7 @@ struct WebPluginInfo;
 // Before a request is sent, this ResourceHandler will also set an appropriate
 // Accept header on the request based on its ResourceType, if one isn't already
 // present.
-class CONTENT_EXPORT MimeTypeResourceHandler
-    : public LayeredResourceHandler,
-      public ResourceController {
+class CONTENT_EXPORT MimeTypeResourceHandler : public BufferedResourceHandler {
  public:
   // If ENABLE_PLUGINS is defined, |plugin_service| must not be NULL.
   MimeTypeResourceHandler(std::unique_ptr<ResourceHandler> next_handler,
@@ -51,24 +48,12 @@ class CONTENT_EXPORT MimeTypeResourceHandler
 
  private:
   // ResourceHandler implementation:
-  void SetController(ResourceController* controller) override;
-  bool OnResponseStarted(ResourceResponse* response, bool* defer) override;
   bool OnWillStart(const GURL&, bool* defer) override;
-  bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
-                  int* buf_size,
-                  int min_size) override;
-  bool OnReadCompleted(int bytes_read, bool* defer) override;
-  void OnResponseCompleted(const net::URLRequestStatus& status,
-                           const std::string& security_info,
-                           bool* defer) override;
-
-  // ResourceController implementation:
-  void Resume() override;
-  void Cancel() override;
-  void CancelAndIgnore() override;
-  void CancelWithError(int error_code) override;
-
-  bool ProcessResponse(bool* defer);
+
+  // BufferedResourceHandler implementation:
+  bool CanStartReplayInResponseStarted() override;
+  bool CanStartReplayInReadCompleted() override;
+  bool WillStartReplay(bool* start_replaying) override;
 
   bool ShouldSniffContent();
   bool DetermineMimeType();
@@ -85,47 +70,15 @@ class CONTENT_EXPORT MimeTypeResourceHandler
   bool UseAlternateNextHandler(std::unique_ptr<ResourceHandler> handler,
                                const std::string& payload_for_old_handler);
 
-  bool ReplayReadCompleted(bool* defer);
-  void CallReplayReadCompleted();
-
   bool MustDownload();
 
-  // Copies data from |read_buffer_| to |next_handler_|.
-  bool CopyReadBufferToNextHandler();
-
   // Called on the IO thread once the list of plugins has been loaded.
   void OnPluginsLoaded(const std::vector<WebPluginInfo>& plugins);
 
-  enum State {
-    STATE_STARTING,
-
-    // In this state, we are filling read_buffer_ with data for the purpose
-    // of sniffing the mime type of the response.
-    STATE_BUFFERING,
-
-    // In this state, we are select an appropriate downstream ResourceHandler
-    // based on the mime type of the response.  We are also potentially waiting
-    // for plugins to load so that we can determine if a plugin is available to
-    // handle the mime type.
-    STATE_PROCESSING,
-
-    // In this state, we are replaying buffered events (OnResponseStarted and
-    // OnReadCompleted) to the downstream ResourceHandler.
-    STATE_REPLAYING,
-
-    // In this state, we are just a blind pass-through ResourceHandler.
-    STATE_STREAMING
-  };
-  State state_;
-
-  scoped_refptr<ResourceResponse> response_;
   ResourceDispatcherHostImpl* host_;
 #if defined(ENABLE_PLUGINS)
   PluginService* plugin_service_;
 #endif
-  scoped_refptr<net::IOBuffer> read_buffer_;
-  int read_buffer_size_;
-  int bytes_read_;
 
   bool must_download_;
   bool must_download_is_set_;