| Index: content/browser/loader/async_revalidation_manager_unittest.cc
|
| diff --git a/content/browser/loader/async_revalidation_manager_unittest.cc b/content/browser/loader/async_revalidation_manager_unittest.cc
|
| index b06f63ce1682bfc4ffa0e1ef897d44cea8dad470..87b14aa1c073d3250295c89d254fdd327d677570 100644
|
| --- a/content/browser/loader/async_revalidation_manager_unittest.cc
|
| +++ b/content/browser/loader/async_revalidation_manager_unittest.cc
|
| @@ -25,7 +25,6 @@
|
| #include "content/common/resource_request.h"
|
| #include "content/public/browser/resource_context.h"
|
| #include "content/public/common/appcache_info.h"
|
| -#include "content/public/common/process_type.h"
|
| #include "content/public/common/resource_type.h"
|
| #include "content/public/test/test_browser_context.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| @@ -207,13 +206,13 @@ class BlackholeFilter : public ResourceMessageFilter {
|
| explicit BlackholeFilter(ResourceContext* resource_context)
|
| : ResourceMessageFilter(
|
| ChildProcessHostImpl::GenerateChildProcessUniqueId(),
|
| - PROCESS_TYPE_RENDERER,
|
| nullptr,
|
| nullptr,
|
| nullptr,
|
| nullptr,
|
| base::Bind(&BlackholeFilter::GetContexts, base::Unretained(this))),
|
| resource_context_(resource_context) {
|
| + OnFilterAdded(nullptr);
|
| ChildProcessSecurityPolicyImpl::GetInstance()->Add(child_id());
|
| }
|
|
|
| @@ -264,6 +263,8 @@ ResourceRequest CreateResourceRequest(const char* method,
|
| return request;
|
| }
|
|
|
| +} // namespace
|
| +
|
| class AsyncRevalidationManagerTest : public ::testing::Test {
|
| protected:
|
| AsyncRevalidationManagerTest(
|
| @@ -307,7 +308,7 @@ class AsyncRevalidationManagerTest : public ::testing::Test {
|
| ResourceRequest request =
|
| CreateResourceRequest("GET", RESOURCE_TYPE_SUB_RESOURCE, url);
|
| ResourceHostMsg_RequestResource msg(render_view_id, request_id, request);
|
| - host_.OnMessageReceived(msg, filter_.get());
|
| + OnMessageReceived(msg, filter_.get());
|
| base::RunLoop().RunUntilIdle();
|
| }
|
|
|
| @@ -318,6 +319,11 @@ class AsyncRevalidationManagerTest : public ::testing::Test {
|
| policy->RegisterWebSafeScheme(scheme);
|
| }
|
|
|
| + void OnMessageReceived(const IPC::Message& message,
|
| + ResourceMessageFilter* filter) {
|
| + host_.OnMessageReceived(message, filter->requester_info());
|
| + }
|
| +
|
| content::TestBrowserThreadBundle thread_bundle_;
|
| std::unique_ptr<TestBrowserContext> browser_context_;
|
| std::unique_ptr<TestURLRequestJobFactory> job_factory_;
|
| @@ -344,7 +350,7 @@ TEST_F(AsyncRevalidationManagerTest, AsyncRevalidationNotSupportedForPOST) {
|
| ResourceRequest request = CreateResourceRequest(
|
| "POST", RESOURCE_TYPE_SUB_RESOURCE, GURL("http://example.com/baz.php"));
|
| ResourceHostMsg_RequestResource msg(0, 1, request);
|
| - host_.OnMessageReceived(msg, filter_.get());
|
| + OnMessageReceived(msg, filter_.get());
|
| base::RunLoop().RunUntilIdle();
|
|
|
| net::URLRequest* url_request(
|
| @@ -554,6 +560,4 @@ TEST_F(AsyncRevalidationManagerRecordingTest, NoSWRAfterFirstRedirectLeg) {
|
| EXPECT_TRUE(IsEmpty());
|
| }
|
|
|
| -} // namespace
|
| -
|
| } // namespace content
|
|
|