Forward MIME types to BrowserPlugin when a viewer is specified.

content/public/browser/resource_dispatcher_host_delegate.h

Index: content/public/browser/resource_dispatcher_host_delegate.h
diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h
index 598cffbe099eac74157bb64c21ddbd23ff5923c8..79e4442d1b04cfc0a9084eeb0cf3ef0c17d8a1d5 100644
--- a/content/public/browser/resource_dispatcher_host_delegate.h
+++ b/content/public/browser/resource_dispatcher_host_delegate.h
@@ -96,32 +96,32 @@ class CONTENT_EXPORT ResourceDispatcherHostDelegate {
   virtual bool ShouldForceDownloadResource(
       const GURL& url, const std::string& mime_type);
 
-  // Returns true and sets |origin| and |target_id| if a Stream should be
-  // created for the resource.
+  // Returns true and sets |origin| if a Stream should be created for the
+  // resource.
   // If true is returned, a new Stream will be created and OnStreamCreated()
   // will be called with
-  // - the |target_id| returned by this function
   // - a StreamHandle instance for the Stream. The handle contains the URL for
   //   reading the Stream etc.
   // The Stream's origin will be set to |origin|.
+  //
+  // If the stream will be rendered in a BrowserPlugin, |payload| will contain
+  // the data that should be given to the old ResourceHandler to forward to the
+  // renderer process.
   virtual bool ShouldInterceptResourceAsStream(
+      net::URLRequest* request,
       content::ResourceContext* resource_context,

[jam, 2014/06/06 15:00:40]

nit: don't pass this as it's available from ResourceRequestInfo which embedders
can easily get from the request through ResourceRequestInfo::ForRequest

[Zachary Kuznia, 2014/06/07 01:45:37]

Done.

-      const GURL& url,
       const std::string& mime_type,
       GURL* origin,
-      std::string* target_id);
+      std::string* payload);
 
-  // Informs the delegate that a Stream was created. |target_id| will be filled
-  // with the parameter returned by ShouldInterceptResourceAsStream(). The
-  // Stream can be read from the blob URL of the Stream, but can only be read
-  // once.
+  // Informs the delegate that a Stream was created. The Stream can be read from
+  // the blob URL of the Stream, but can only be read once.
   virtual void OnStreamCreated(
+      net::URLRequest* request,
       content::ResourceContext* resource_context,
       int render_process_id,
       int render_view_id,

[jam, 2014/06/06 15:00:40]

ditto for the above three parameters

[Zachary Kuznia, 2014/06/07 01:45:37]

Done.

-      const std::string& target_id,
-      scoped_ptr<StreamHandle> stream,
-      int64 expected_content_size);
+      scoped_ptr<content::StreamHandle> stream);
 
   // Informs the delegate that a response has started.
   virtual void OnResponseStarted(