Split up streams logic to prepare for PlzNavigate RDH changes.

content/browser/loader/stream_resource_handler.h

 // Copyright (c) 2013 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_STREAM_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_LOADER_STREAM_RESOURCE_HANDLER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/loader/resource_handler.h"
-#include "content/browser/streams/stream_write_observer.h"
-#include "url/gurl.h"
+#include "content/browser/loader/stream_writer.h"
 
 namespace net {
 class URLRequest;
 }  // namespace net
 
 namespace content {
 
 class StreamRegistry;
 
 // Redirect this resource to a stream.

[mmenke, 2014/10/15 20:05:43]

Maybe "resource" -> "resource response"?

Admittedly, the response is kinda implied by the fact this is a ResourceHandler,
but makes things a little clearer.

[mmenke, 2014/10/15 20:05:43]

stream -> Stream

-class StreamResourceHandler : public StreamWriteObserver,
-                              public ResourceHandler {
+class StreamResourceHandler : public ResourceHandler {
  public:
   // |origin| will be used to construct the URL for the Stream. See
   // WebCore::BlobURL and and WebCore::SecurityOrigin in Blink to understand
   // how origin check is done on resource loading.
   StreamResourceHandler(net::URLRequest* request,
                         StreamRegistry* registry,
                         const GURL& origin);
   virtual ~StreamResourceHandler();
 
+  virtual void SetController(ResourceController* controller) override;
+
   virtual bool OnUploadProgress(uint64 position, uint64 size) override;
 
   // Not needed, as this event handler ought to be the final resource.
   virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info,
                                    ResourceResponse* resp,
                                    bool* defer) override;
 
   virtual bool OnResponseStarted(ResourceResponse* resp,
                                  bool* defer) override;
 
   virtual bool OnWillStart(const GURL& url, bool* defer) override;
 
   virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) override;
 
   // Create a new buffer to store received data.
   virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf,
                           int* buf_size,
                           int min_size) override;
 
   // A read was completed, forward the data to the Stream.
   virtual bool OnReadCompleted(int bytes_read, bool* defer) override;
 
   virtual void OnResponseCompleted(const net::URLRequestStatus& status,
                                    const std::string& sec_info,
                                    bool* defer) override;
 
   virtual void OnDataDownloaded(int bytes_downloaded) override;
 
-  Stream* stream() { return stream_.get(); }
+  Stream* stream() { return writer_.stream(); }
 
  private:
-  virtual void OnSpaceAvailable(Stream* stream) override;
-  virtual void OnClose(Stream* stream) override;
+  StreamWriter writer_;
 
-  scoped_refptr<Stream> stream_;
-  scoped_refptr<net::IOBuffer> read_buffer_;
   DISALLOW_COPY_AND_ASSIGN(StreamResourceHandler);

[mmenke, 2014/10/15 20:05:43]

While you're here...  include base/macros.h?

 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_LOADER_STREAM_RESOURCE_HANDLER_H_