Ensuring interception of stream get determined by plugin path before checking mime type.

content/browser/loader/buffered_resource_handler_unittest.cc

 // Copyright 2014 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 "content/browser/loader/buffered_resource_handler.h"
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
@@ skipping 81 matching lines @@
       net::URLRequest* request,
       bool is_content_initiated,
       bool must_download,
       uint32 id,
       scoped_ptr<DownloadSaveInfo> save_info,
       const DownloadUrlParameters::OnStartedCallback& started_cb) override {
     return scoped_ptr<ResourceHandler>(new TestResourceHandler).Pass();
   }
 
   scoped_ptr<ResourceHandler> MaybeInterceptAsStream(
+      const base::FilePath& plugin_path,
       net::URLRequest* request,
       ResourceResponse* response,
       std::string* payload) override {
     if (stream_has_handler_) {
       intercepted_as_stream_ = true;
       return scoped_ptr<ResourceHandler>(new TestResourceHandler).Pass();
     } else {
       return scoped_ptr<ResourceHandler>();
     }
   }
@@ skipping 34 matching lines @@
     NOTREACHED();
   }
 
   void Resume() override {
     NOTREACHED();
   }
 };
 
 class BufferedResourceHandlerTest : public testing::Test {
  public:
-  BufferedResourceHandlerTest() : stream_has_handler_(false) {}
+  BufferedResourceHandlerTest()
+      : stream_has_handler_(false), plugin_available_(false) {}
 
   void set_stream_has_handler(bool stream_has_handler) {
     stream_has_handler_ = stream_has_handler;
   }
 
+  void set_plugin_available(bool plugin_available) {
+    plugin_available_ = plugin_available;
+  }
+
   bool TestStreamIsIntercepted(bool allow_download,
                                bool must_download,
                                ResourceType request_resource_type);
 
  private:
   // Whether the URL request should be intercepted as a stream.
   bool stream_has_handler_;
+  bool plugin_available_;
 
   TestBrowserThreadBundle thread_bundle_;
 };
 
 bool BufferedResourceHandlerTest::TestStreamIsIntercepted(
     bool allow_download,
     bool must_download,
     ResourceType request_resource_type) {
   net::URLRequestContext context;
   scoped_ptr<net::URLRequest> request(context.CreateRequest(
       GURL("http://www.google.com"), net::DEFAULT_PRIORITY, nullptr, nullptr));
   bool is_main_frame = request_resource_type == RESOURCE_TYPE_MAIN_FRAME;
   ResourceRequestInfo::AllocateForTesting(
       request.get(),
       request_resource_type,
       nullptr,          // context
       0,                // render_process_id
       0,                // render_view_id
       0,                // render_frame_id
       is_main_frame,    // is_main_frame
       false,            // parent_is_main_frame
       allow_download,   // allow_download
       true);            // is_async
 
   TestResourceDispatcherHost host(stream_has_handler_);
   TestResourceDispatcherHostDelegate host_delegate(must_download);
   host.SetDelegate(&host_delegate);
 
-  FakePluginService plugin_service;
+  FakePluginService plugin_service(plugin_available_);
   scoped_ptr<ResourceHandler> buffered_handler(
       new BufferedResourceHandler(
           scoped_ptr<ResourceHandler>(new TestResourceHandler()).Pass(),
           &host,
           &plugin_service,
           request.get()));
   TestResourceController resource_controller;
   buffered_handler->SetController(&resource_controller);
 
   scoped_refptr<ResourceResponse> response(new ResourceResponse);
   // The MIME type isn't important but it shouldn't be empty.
   response->head.mime_type = "application/pdf";
 
   bool defer = false;
   buffered_handler->OnResponseStarted(response.get(), &defer);
 
   content::RunAllPendingInMessageLoop();
 
   return host.intercepted_as_stream();
 }
 
 // Test that stream requests are correctly intercepted under the right
 // circumstances.
 TEST_F(BufferedResourceHandlerTest, StreamHandling) {
   bool allow_download;
   bool must_download;
   ResourceType resource_type;
 
+  set_plugin_available(false);

[raymes, 2015/03/19 00:45:51]

Let's set the plugin as available for most of the tests and just add a single
additional test where it isn't available but the stream is still intercepted.
This should test the legacy codepath (for the streamsPrivate API).

[Deepak, 2015/03/19 10:22:23]

Done.

   // Ensure the stream is handled by MaybeInterceptAsStream in the
   // ResourceDispatcherHost.
   set_stream_has_handler(true);
 
   // Main frame request with no download allowed. Stream shouldn't be
   // intercepted.
   allow_download = false;
   must_download = false;
   resource_type = RESOURCE_TYPE_MAIN_FRAME;
   EXPECT_FALSE(
@@ skipping 38 matching lines @@
   EXPECT_FALSE(
       TestStreamIsIntercepted(allow_download, must_download, resource_type));
 
   allow_download = true;
   must_download = false;
   resource_type = RESOURCE_TYPE_MAIN_FRAME;
   EXPECT_FALSE(
       TestStreamIsIntercepted(allow_download, must_download, resource_type));
 }
 
+// Test that stream requests are correctly intercepted under the right
+// circumstances with plugin path.
+TEST_F(BufferedResourceHandlerTest, StreamHandlingWithPluginPath) {

[raymes, 2015/03/19 00:39:22]

I think it would be sufficient to add a single additional case to the test above
which hits that new code path rather than adding this whole function. 

[Deepak, 2015/03/19 10:22:23]

Done.

+  bool allow_download;
+  bool must_download;
+  ResourceType resource_type;
+
+  // Ensure the stream is handled by MaybeInterceptAsStream in the
+  // ResourceDispatcherHost.
+  set_stream_has_handler(true);
+
+  allow_download = false;
+  must_download = false;
+  resource_type = RESOURCE_TYPE_OBJECT;
+  set_plugin_available(true);
+  EXPECT_TRUE(
+      TestStreamIsIntercepted(allow_download, must_download, resource_type));
+
+  allow_download = false;
+  must_download = false;
+  resource_type = RESOURCE_TYPE_OBJECT;
+  set_plugin_available(false);
+  EXPECT_TRUE(
+      TestStreamIsIntercepted(allow_download, must_download, resource_type));
+
+  // Test the cases where the stream isn't handled by MaybeInterceptAsStream
+  // in the ResourceDispatcherHost.
+  set_stream_has_handler(false);
+
+  allow_download = false;
+  must_download = false;
+  resource_type = RESOURCE_TYPE_OBJECT;
+  set_plugin_available(true);
+  EXPECT_FALSE(
+      TestStreamIsIntercepted(allow_download, must_download, resource_type));
+
+  allow_download = false;
+  must_download = false;
+  resource_type = RESOURCE_TYPE_OBJECT;
+  set_plugin_available(false);
+  EXPECT_FALSE(
+      TestStreamIsIntercepted(allow_download, must_download, resource_type));
+}
+
 }  // namespace
 
 }  // namespace content