Index: content/browser/loader/buffered_resource_handler_unittest.cc |
diff --git a/content/browser/loader/buffered_resource_handler_unittest.cc b/content/browser/loader/buffered_resource_handler_unittest.cc |
index e4d3668c371ff059657b48868c2a574c6f97dd13..4e8479133dbb194b3aa91c48acfc5427bf6a72cd 100644 |
--- a/content/browser/loader/buffered_resource_handler_unittest.cc |
+++ b/content/browser/loader/buffered_resource_handler_unittest.cc |
@@ -12,6 +12,7 @@ |
#include "content/public/browser/resource_dispatcher_host_delegate.h" |
#include "content/public/browser/resource_request_info.h" |
#include "content/public/common/resource_response.h" |
+#include "content/public/common/webplugininfo.h" |
#include "content/public/test/test_browser_thread_bundle.h" |
#include "content/public/test/test_utils.h" |
#include "content/test/fake_plugin_service.h" |
@@ -99,6 +100,7 @@ class TestResourceDispatcherHost : public ResourceDispatcherHostImpl { |
} |
scoped_ptr<ResourceHandler> MaybeInterceptAsStream( |
+ const base::FilePath& plugin_path, |
net::URLRequest* request, |
ResourceResponse* response, |
std::string* payload) override { |
@@ -151,14 +153,58 @@ class TestResourceController : public ResourceController { |
} |
}; |
+class TestFakePluginService : public FakePluginService { |
+ public: |
+ explicit TestFakePluginService(bool plugin_available) |
+ : plugin_available_(plugin_available) {} |
mmenke
2015/03/24 14:44:32
nit: Blank line after constructor.
Deepak
2015/03/25 05:43:34
Done.
|
+ bool GetPluginInfo(int render_process_id, |
+ int render_frame_id, |
+ ResourceContext* context, |
+ const GURL& url, |
+ const GURL& page_url, |
+ const std::string& mime_type, |
+ bool allow_wildcard, |
+ bool* is_stale, |
+ WebPluginInfo* info, |
+ std::string* actual_mime_type) override; |
+ |
+ private: |
+ bool plugin_available_; |
mmenke
2015/03/24 14:44:32
nit: const?
Deepak
2015/03/25 05:43:35
Done.
|
+ DISALLOW_COPY_AND_ASSIGN(TestFakePluginService); |
mmenke
2015/03/24 14:44:32
nit: Line break before DISALLOW_COPY_AND_ASSIGN
Deepak
2015/03/25 05:43:35
Done.
|
+}; |
+ |
+bool TestFakePluginService::GetPluginInfo(int render_process_id, |
+ int render_frame_id, |
+ ResourceContext* context, |
+ const GURL& url, |
+ const GURL& page_url, |
+ const std::string& mime_type, |
+ bool allow_wildcard, |
+ bool* is_stale, |
+ WebPluginInfo* info, |
+ std::string* actual_mime_type) { |
mmenke
2015/03/24 14:44:32
optional: May want to just inline this method, gi
Deepak
2015/03/25 05:43:35
Done.
|
+ *is_stale = false; |
+ if (!plugin_available_) |
+ return false; |
+ info->type = WebPluginInfo::PLUGIN_TYPE_BROWSER_PLUGIN; |
+ info->path = base::FilePath::FromUTF8Unsafe(std::string( |
mmenke
2015/03/24 14:44:32
include base::FilePath
Deepak
2015/03/25 05:43:34
Done.
|
+ "chrome-extension://mhjfbmdgcfjbbpaeojofohoefgiehjai/")); |
+ return true; |
+} |
+ |
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); |
@@ -166,6 +212,7 @@ class BufferedResourceHandlerTest : public testing::Test { |
private: |
// Whether the URL request should be intercepted as a stream. |
bool stream_has_handler_; |
+ bool plugin_available_; |
TestBrowserThreadBundle thread_bundle_; |
}; |
@@ -194,7 +241,7 @@ bool BufferedResourceHandlerTest::TestStreamIsIntercepted( |
TestResourceDispatcherHostDelegate host_delegate(must_download); |
host.SetDelegate(&host_delegate); |
- FakePluginService plugin_service; |
+ TestFakePluginService plugin_service(plugin_available_); |
scoped_ptr<ResourceHandler> buffered_handler( |
new BufferedResourceHandler( |
scoped_ptr<ResourceHandler>(new TestResourceHandler()).Pass(), |
@@ -227,6 +274,7 @@ TEST_F(BufferedResourceHandlerTest, StreamHandling) { |
// ResourceDispatcherHost. |
set_stream_has_handler(true); |
+ set_plugin_available(true); |
// Main frame request with no download allowed. Stream shouldn't be |
// intercepted. |
allow_download = false; |
@@ -279,6 +327,17 @@ TEST_F(BufferedResourceHandlerTest, StreamHandling) { |
resource_type = RESOURCE_TYPE_MAIN_FRAME; |
EXPECT_FALSE( |
TestStreamIsIntercepted(allow_download, must_download, resource_type)); |
+ |
+ // Test the cases where the stream handled by MaybeInterceptAsStream |
+ // with plugin not available. This is the case when intercepting streams for |
+ // the streamsPrivate extensions API. |
+ set_stream_has_handler(true); |
+ allow_download = false; |
+ must_download = false; |
+ resource_type = RESOURCE_TYPE_OBJECT; |
+ set_plugin_available(false); |
+ EXPECT_TRUE( |
+ TestStreamIsIntercepted(allow_download, must_download, resource_type)); |
mmenke
2015/03/24 14:44:32
Should we also have a similar test where is_stale
Deepak
2015/03/25 05:43:34
Done.
|
} |
} // namespace |