Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/browser/loader/resource_dispatcher_host_unittest.cc

Issue 2321543002: Merge CrossSiteResourceHandler and NavigationResourceThrottle (Closed)
Patch Set: Addressed nits Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/loader/resource_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/loader/resource_dispatcher_host_unittest.cc
diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc
index 41bc0d1910fce129fc60d2be8c346d964623f131..72f6a0af9444d42f047eaf25fde348e98c2fd3fa 100644
--- a/content/browser/loader/resource_dispatcher_host_unittest.cc
+++ b/content/browser/loader/resource_dispatcher_host_unittest.cc
@@ -27,7 +27,6 @@
#include "content/browser/download/download_manager_impl.h"
#include "content/browser/download/download_resource_handler.h"
#include "content/browser/frame_host/navigation_request_info.h"
-#include "content/browser/loader/cross_site_resource_handler.h"
#include "content/browser/loader/detachable_resource_handler.h"
#include "content/browser/loader/navigation_resource_throttle.h"
#include "content/browser/loader/navigation_url_loader.h"
@@ -619,16 +618,6 @@ class TestUserData : public base::SupportsUserData::Data {
bool* was_deleted_;
};
-class TransfersAllNavigationsContentBrowserClient
- : public TestContentBrowserClient {
- public:
- bool ShouldSwapProcessesForRedirect(ResourceContext* resource_context,
- const GURL& current_url,
- const GURL& new_url) override {
- return true;
- }
-};
-
enum GenericResourceThrottleFlags {
NONE = 0,
DEFER_STARTING_REQUEST = 1 << 0,
@@ -2686,7 +2675,7 @@ TEST_P(ResourceDispatcherHostTest, CancelRequestsForContextTransferred) {
GlobalRequestID global_request_id(web_contents_filter_->child_id(),
request_id);
- host_.MarkAsTransferredNavigation(global_request_id, nullptr);
+ host_.MarkAsTransferredNavigation(global_request_id, base::Closure());
// And now simulate a cancellation coming from the renderer.
ResourceHostMsg_CancelRequest msg(request_id);
@@ -2713,13 +2702,11 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationHtml) {
SUCCEED() << "Test is not applicable with browser side navigation enabled";
return;
}
- // This test expects the cross site request to be leaked, so it can transfer
- // the request directly.
- CrossSiteResourceHandler::SetLeakRequestsForTesting(true);
EXPECT_EQ(0, host_.pending_requests());
NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
+ NavigationResourceThrottle::set_force_transfer_for_testing(true);
int render_view_id = 0;
int request_id = 1;
@@ -2730,11 +2717,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationHtml) {
HandleScheme("http");
- // Temporarily replace ContentBrowserClient with one that will trigger the
- // transfer navigation code paths.
- TransfersAllNavigationsContentBrowserClient new_client;
- ContentBrowserClient* old_client = SetBrowserClientForTesting(&new_client);
-
MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
GURL("http://example.com/blah"),
RESOURCE_TYPE_MAIN_FRAME);
@@ -2753,9 +2735,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationHtml) {
// MimeTypeResourceHandler.
while (net::URLRequestTestJob::ProcessOnePendingMessage()) {}
- // Restore, now that we've set up a transfer.
- SetBrowserClientForTesting(old_client);
-
// This second filter is used to emulate a second process.
scoped_refptr<ForwardingFilter> second_filter = MakeForwardingFilter();
@@ -2788,10 +2767,8 @@ TEST_P(ResourceDispatcherHostTest, TransferTwoNavigationsHtml) {
SUCCEED() << "Test is not applicable with browser side navigation enabled";
return;
}
- // This test expects the cross site request to be leaked, so it can transfer
- // the request directly.
- CrossSiteResourceHandler::SetLeakRequestsForTesting(true);
+ NavigationResourceThrottle::set_force_transfer_for_testing(true);
NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
EXPECT_EQ(0, host_.pending_requests());
@@ -2807,11 +2784,6 @@ TEST_P(ResourceDispatcherHostTest, TransferTwoNavigationsHtml) {
HandleScheme("http");
- // Temporarily replace ContentBrowserClient with one that will trigger the
- // transfer navigation code paths.
- TransfersAllNavigationsContentBrowserClient new_client;
- ContentBrowserClient* old_client = SetBrowserClientForTesting(&new_client);
-
// Make the first request.
MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
GURL("http://example.com/blah"),
@@ -2828,8 +2800,7 @@ TEST_P(ResourceDispatcherHostTest, TransferTwoNavigationsHtml) {
// MimeTypeResourceHandler.
while (net::URLRequestTestJob::ProcessOnePendingMessage()) {}
- // Restore, now that we've set up a transfer.
- SetBrowserClientForTesting(old_client);
+ NavigationResourceThrottle::set_force_transfer_for_testing(false);
// This second filter is used to emulate a second process.
scoped_refptr<ForwardingFilter> second_filter = MakeForwardingFilter();
@@ -2875,10 +2846,8 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationText) {
SUCCEED() << "Test is not applicable with browser side navigation enabled";
return;
}
- // This test expects the cross site request to be leaked, so it can transfer
- // the request directly.
- CrossSiteResourceHandler::SetLeakRequestsForTesting(true);
+ NavigationResourceThrottle::set_force_transfer_for_testing(true);
NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
EXPECT_EQ(0, host_.pending_requests());
@@ -2892,11 +2861,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationText) {
HandleScheme("http");
- // Temporarily replace ContentBrowserClient with one that will trigger the
- // transfer navigation code paths.
- TransfersAllNavigationsContentBrowserClient new_client;
- ContentBrowserClient* old_client = SetBrowserClientForTesting(&new_client);
-
MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
GURL("http://example.com/blah"),
RESOURCE_TYPE_MAIN_FRAME);
@@ -2918,9 +2882,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationText) {
while (net::URLRequestTestJob::ProcessOnePendingMessage()) {}
base::RunLoop().RunUntilIdle();
- // Restore, now that we've set up a transfer.
- SetBrowserClientForTesting(old_client);
-
// This second filter is used to emulate a second process.
scoped_refptr<ForwardingFilter> second_filter = MakeForwardingFilter();
@@ -2951,10 +2912,8 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithProcessCrash) {
SUCCEED() << "Test is not applicable with browser side navigation enabled";
return;
}
- // This test expects the cross site request to be leaked, so it can transfer
- // the request directly.
- CrossSiteResourceHandler::SetLeakRequestsForTesting(true);
+ NavigationResourceThrottle::set_force_transfer_for_testing(true);
NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
EXPECT_EQ(0, host_.pending_requests());
@@ -2970,11 +2929,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithProcessCrash) {
HandleScheme("http");
- // Temporarily replace ContentBrowserClient with one that will trigger the
- // transfer navigation code paths.
- TransfersAllNavigationsContentBrowserClient new_client;
- ContentBrowserClient* old_client = SetBrowserClientForTesting(&new_client);
-
// Create a first filter that can be deleted before the second one starts.
{
scoped_refptr<ForwardingFilter> first_filter = MakeForwardingFilter();
@@ -3003,9 +2957,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithProcessCrash) {
}
// The first filter is now deleted, as if the child process died.
- // Restore.
- SetBrowserClientForTesting(old_client);
-
// Make sure we don't hold onto the ResourceMessageFilter after it is deleted.
GlobalRequestID first_global_request_id(first_child_id, request_id);
@@ -3041,10 +2992,8 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) {
SUCCEED() << "Test is not applicable with browser side navigation enabled";
return;
}
- // This test expects the cross site request to be leaked, so it can transfer
- // the request directly.
- CrossSiteResourceHandler::SetLeakRequestsForTesting(true);
+ NavigationResourceThrottle::set_force_transfer_for_testing(true);
NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
EXPECT_EQ(0, host_.pending_requests());
@@ -3058,11 +3007,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) {
HandleScheme("http");
- // Temporarily replace ContentBrowserClient with one that will trigger the
- // transfer navigation code paths.
- TransfersAllNavigationsContentBrowserClient new_client;
- ContentBrowserClient* old_client = SetBrowserClientForTesting(&new_client);
-
MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
GURL("http://example.com/blah"),
RESOURCE_TYPE_MAIN_FRAME);
@@ -3091,9 +3035,6 @@ TEST_P(ResourceDispatcherHostTest, TransferNavigationWithTwoRedirects) {
while (net::URLRequestTestJob::ProcessOnePendingMessage()) {}
base::RunLoop().RunUntilIdle();
- // Restore.
- SetBrowserClientForTesting(old_client);
-
// This second filter is used to emulate a second process.
scoped_refptr<ForwardingFilter> second_filter = MakeForwardingFilter();
« no previous file with comments | « content/browser/loader/resource_dispatcher_host_impl.cc ('k') | content/browser/loader/resource_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698