Remove the BeginSaveFile and BeginDownload methods from ResourceDispatcherHostImpl

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>
 
 #include "base/bind.h"
 #include "base/feature_list.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/shared_memory.h"
 #include "base/pickle.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/cert_store_impl.h"
 #include "content/browser/child_process_security_policy_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_url_loader.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/loader/resource_loader.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/resource_request_info_impl.h"
 #include "content/browser/loader_delegate_impl.h"
 #include "content/common/appcache_interfaces.h"
@@ skipping 809 matching lines @@
 }
 
 class ResourceDispatcherHostTest : public testing::TestWithParam<TestConfig>,
                                    public IPC::Sender {
  public:
   typedef ResourceDispatcherHostImpl::LoadInfo LoadInfo;
   typedef ResourceDispatcherHostImpl::LoadInfoMap LoadInfoMap;
 
   ResourceDispatcherHostTest()
       : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),
+        host_(base::Bind(base::Bind(&DownloadResourceHandler::Create))),
         use_test_ssl_certificate_(false),
         send_data_received_acks_(false),
         auto_advance_(false) {
     host_.SetLoaderDelegate(&loader_delegate_);
     browser_context_.reset(new TestBrowserContext());
     BrowserContext::EnsureResourceContextInitialized(browser_context_.get());
     base::RunLoop().RunUntilIdle();
     filter_ = MakeForwardingFilter();
     // TODO(cbentzel): Better way to get URLRequestContext?
     net::URLRequestContext* request_context =
@@ skipping 133 matching lines @@
   // Generates a request with the given priority.
   void MakeTestRequestWithPriority(int render_view_id,
                                    int request_id,
                                    net::RequestPriority priority);
 
   void MakeTestRequestWithPriorityAndRenderFrame(int render_view_id,
                                                  int render_frame_id,
                                                  int request_id,
                                                  net::RequestPriority priority);
 
-  void MakeWebContentsAssociatedDownloadRequest(int request_id,
-                                                const GURL& url);
-
   void CancelRequest(int request_id);
   void RendererCancelRequest(int request_id) {
     ResourceMessageFilter* old_filter = SetFilter(filter_.get());
     host_.OnCancelRequest(request_id);
     SetFilter(old_filter);
   }
 
   void CompleteStartRequest(int request_id);
   void CompleteStartRequest(ResourceMessageFilter* filter, int request_id);
 
@@ skipping 205 matching lines @@
     int request_id,
     net::RequestPriority priority) {
   ResourceRequest request = CreateResourceRequest(
       "GET", RESOURCE_TYPE_SUB_RESOURCE, GURL("http://example.com/priority"));
   request.render_frame_id = render_frame_id;
   request.priority = priority;
   ResourceHostMsg_RequestResource msg(render_view_id, request_id, request);
   host_.OnMessageReceived(msg, filter_.get());
 }
 
-void ResourceDispatcherHostTest::MakeWebContentsAssociatedDownloadRequest(
-    int request_id,
-    const GURL& url) {
-  net::URLRequestContext* request_context =
-      browser_context_->GetResourceContext()->GetRequestContext();
-  std::unique_ptr<net::URLRequest> request(
-      request_context->CreateRequest(url, net::DEFAULT_PRIORITY, NULL));
-  host_.BeginDownload(std::move(request), Referrer(),
-                      false,  // is_content_initiated
-                      browser_context_->GetResourceContext(),
-                      web_contents_->GetRenderProcessHost()->GetID(),
-                      web_contents_->GetRoutingID(),
-                      web_contents_->GetMainFrame()->GetRoutingID(), false);
-}
-
 void ResourceDispatcherHostTest::CancelRequest(int request_id) {
   host_.CancelRequest(filter_->child_id(), request_id);
 }
 
 void ResourceDispatcherHostTest::CompleteStartRequest(int request_id) {
   CompleteStartRequest(filter_.get(), request_id);
 }
 
 void ResourceDispatcherHostTest::CompleteStartRequest(
     ResourceMessageFilter* filter,
@@ skipping 2441 matching lines @@
   host_.OnMessageReceived(priority_msg, filter_.get());
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(3, job_factory_->url_request_jobs_created_count());
 
   // Cleanup.
   host_.OnRenderViewHostDeleted(filter_->child_id(),  // child_id
                                 0);                   // route_id
 }
 
-// Confirm that resource response started notifications for downloads are not
-// transmitted to the WebContents.
-TEST_P(ResourceDispatcherHostTest, TransferResponseStartedDownload) {
-  int initial_count(web_contents_observer_->resource_response_start_count());
-
-  MakeWebContentsAssociatedDownloadRequest(
-      1, net::URLRequestTestJob::test_url_1());
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(initial_count,
-            web_contents_observer_->resource_response_start_count());
-}
-
-// Confirm that request redirected notifications for downloads are not
-// transmitted to the WebContents.
-TEST_P(ResourceDispatcherHostTest, TransferRequestRedirectedDownload) {
-  int initial_count(web_contents_observer_->resource_request_redirect_count());
-
-  MakeWebContentsAssociatedDownloadRequest(
-      1, net::URLRequestTestJob::test_url_redirect_to_url_2());
-  base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(initial_count,
-            web_contents_observer_->resource_request_redirect_count());
-}
-
 // A URLRequestTestJob that sets a test certificate on the |ssl_info|
 // field of the response.
 class TestHTTPSURLRequestJob : public net::URLRequestTestJob {
  public:
   TestHTTPSURLRequestJob(net::URLRequest* request,
                          net::NetworkDelegate* network_delegate,
                          const std::string& response_headers,
                          const std::string& response_data,
                          bool auto_advance)
       : net::URLRequestTestJob(request,
@@ skipping 75 matching lines @@
   return nullptr;
 }
 
 INSTANTIATE_TEST_CASE_P(
     ResourceDispatcherHostTests,
     ResourceDispatcherHostTest,
     testing::Values(TestConfig::kDefault,
                     TestConfig::kOptimizeIPCForSmallResourceEnabled));
 
 }  // namespace content