PlzNavigate: make NavigationResourceHandler a LayeredResourceHandler

content/browser/loader/resource_dispatcher_host_unittest.cc

 // Copyright (c) 2012 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 <stddef.h>
 
 #include <memory>
 #include <utility>
 #include <vector>
 
@@ skipping 2541 matching lines @@
   // Since the request had already started processing as a download,
   // the cancellation above should have been ignored and the request
   // should still be alive.
   EXPECT_EQ(1, host_.pending_requests());
 
   while (net::URLRequestTestJob::ProcessOnePendingMessage()) {}
   content::RunAllBlockingPoolTasksUntilIdle();
 }
 
 TEST_F(ResourceDispatcherHostTest, CancelRequestsForContext) {
+  if (IsBrowserSideNavigationEnabled())
+    return;
+
   EXPECT_EQ(0, host_.pending_requests());
   NavigationResourceThrottle::set_ui_checks_always_succeed_for_testing(true);
 
   int render_view_id = 0;
   int request_id = 1;
 
   std::string raw_headers("HTTP\n"
                           "Content-disposition: attachment; filename=foo\n\n");
   std::string response_data("01234567890123456789\x01foobar");
   // Get past sniffing metrics.
   response_data.resize(1025, ' ');
 
   SetResponse(raw_headers, response_data);
   job_factory_->SetDelayedCompleteJobGeneration(true);
   HandleScheme("http");
 
   const GURL download_url = GURL("http://example.com/blah");
 
-  if (IsBrowserSideNavigationEnabled()) {
-    // Create a NavigationRequest.
-    TestNavigationURLLoaderDelegate delegate;
-    BeginNavigationParams begin_params(
-        std::string(), net::LOAD_NORMAL, false, false,
-        REQUEST_CONTEXT_TYPE_LOCATION,
-        blink::WebMixedContentContextType::kBlockable,
-        false,  // is_form_submission
-        url::Origin(download_url));
-    CommonNavigationParams common_params;
-    common_params.url = download_url;
-    std::unique_ptr<NavigationRequestInfo> request_info(
-        new NavigationRequestInfo(common_params, begin_params, download_url,
-                                  true, false, false, -1, false, false,
-                                  blink::kWebPageVisibilityStateVisible));
-    std::unique_ptr<NavigationURLLoader> loader = NavigationURLLoader::Create(
-        browser_context_->GetResourceContext(),
-        BrowserContext::GetDefaultStoragePartition(browser_context_.get()),
-        std::move(request_info), nullptr, nullptr, nullptr, &delegate);
+  MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
+                                  download_url, RESOURCE_TYPE_MAIN_FRAME);
 
-    // Wait until a response has been received and proceed with the response.
-    KickOffRequest();
+  // Return some data so that the request is identified as a download
+  // and the proper resource handlers are created.
+  EXPECT_TRUE(net::URLRequestTestJob::ProcessOnePendingMessage());
+  content::RunAllBlockingPoolTasksUntilIdle();
 
-    // Return some data so that the request is identified as a download
-    // and the proper resource handlers are created.
-    EXPECT_TRUE(net::URLRequestTestJob::ProcessOnePendingMessage());
-    content::RunAllBlockingPoolTasksUntilIdle();
+  // And now simulate a cancellation coming from the renderer.
+  ResourceHostMsg_CancelRequest msg(request_id);
+  OnMessageReceived(msg, filter_.get());
 
-    // The UI thread will be informed that the navigation failed with an error
-    // code of ERR_ABORTED because the navigation turns out to be a download.
-    // The navigation is aborted, but the request goes on as a download.
-    EXPECT_EQ(delegate.net_error(), net::ERR_ABORTED);
-    EXPECT_EQ(1, host_.pending_requests());
+  // Since the request had already started processing as a download,
+  // the cancellation above should have been ignored and the request
+  // should still be alive.
+  EXPECT_EQ(1, host_.pending_requests());
 
-    // In PlzNavigate, the renderer cannot cancel the request directly.
-    // However, cancelling by context should work.
-    host_.CancelRequestsForContext(browser_context_->GetResourceContext());
-    EXPECT_EQ(0, host_.pending_requests());
+  // Cancelling by other methods shouldn't work either.
+  host_.CancelRequestsForProcess(render_view_id);
+  EXPECT_EQ(1, host_.pending_requests());
 
-    content::RunAllBlockingPoolTasksUntilIdle();
-  } else {
-    MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
-                                    download_url, RESOURCE_TYPE_MAIN_FRAME);
+  // Cancelling by context should work.
+  host_.CancelRequestsForContext(filter_->resource_context());
+  EXPECT_EQ(0, host_.pending_requests());
 
-    // Return some data so that the request is identified as a download
-    // and the proper resource handlers are created.
-    EXPECT_TRUE(net::URLRequestTestJob::ProcessOnePendingMessage());
-    content::RunAllBlockingPoolTasksUntilIdle();
-
-    // And now simulate a cancellation coming from the renderer.
-    ResourceHostMsg_CancelRequest msg(request_id);
-    OnMessageReceived(msg, filter_.get());
-
-    // Since the request had already started processing as a download,
-    // the cancellation above should have been ignored and the request
-    // should still be alive.
-    EXPECT_EQ(1, host_.pending_requests());
-
-    // Cancelling by other methods shouldn't work either.
-    host_.CancelRequestsForProcess(render_view_id);
-    EXPECT_EQ(1, host_.pending_requests());
-
-    // Cancelling by context should work.
-    host_.CancelRequestsForContext(filter_->resource_context());
-    EXPECT_EQ(0, host_.pending_requests());
-
-    while (net::URLRequestTestJob::ProcessOnePendingMessage()) {
-    }
-    content::RunAllBlockingPoolTasksUntilIdle();
+  while (net::URLRequestTestJob::ProcessOnePendingMessage()) {
   }
+  content::RunAllBlockingPoolTasksUntilIdle();
 }
 
 TEST_F(ResourceDispatcherHostTest, CancelRequestsForContextDetached) {
   EXPECT_EQ(0, host_.pending_requests());
 
   int render_view_id = 0;
   int request_id = 1;
 
   MakeTestRequestWithResourceType(filter_.get(), render_view_id, request_id,
                                   net::URLRequestTestJob::test_url_4(),
@@ skipping 1268 matching lines @@
   return nullptr;
 }
 
 net::URLRequestJob* TestURLRequestJobFactory::MaybeInterceptResponse(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate) const {
   return nullptr;
 }
 
 }  // namespace content