WIP - Refactor programmatic downloads

content/browser/download/save_package.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 "content/browser/download/save_package.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
+#include "content/browser/download/download_create_info.h"
 #include "content/browser/download/download_item_impl.h"
 #include "content/browser/download/download_manager_impl.h"
 #include "content/browser/download/download_stats.h"
 #include "content/browser/download/save_file.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/download/save_item.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/download_manager_delegate.h"
+#include "content/public/browser/download_save_info.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/resource_context.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_context.h"
@@ skipping 52 matching lines @@
 }
 
 // Check whether we can save page as complete-HTML for the contents which
 // have specified a MIME type. Now only contents which have the MIME type
 // "text/html" can be saved as complete-HTML.
 bool CanSaveAsComplete(const std::string& contents_mime_type) {
   return contents_mime_type == "text/html" ||
          contents_mime_type == "application/xhtml+xml";
 }
 
-// Request handle for SavePackage downloads. Currently doesn't support
-// pause/resume/cancel, but returns a WebContents.
-class SavePackageRequestHandle : public DownloadRequestHandleInterface {
- public:
-  SavePackageRequestHandle(base::WeakPtr<SavePackage> save_package)
-      : save_package_(save_package) {}
-
-  // DownloadRequestHandleInterface
-  virtual WebContents* GetWebContents() const OVERRIDE {
-    return save_package_.get() ? save_package_->web_contents() : NULL;
-  }
-  virtual DownloadManager* GetDownloadManager() const OVERRIDE {
-    return NULL;
-  }
-  virtual void PauseRequest() const OVERRIDE {}
-  virtual void ResumeRequest() const OVERRIDE {}
-  virtual void CancelRequest() const OVERRIDE {}
-  virtual std::string DebugString() const OVERRIDE {
-    return "SavePackage DownloadRequestHandle";
-  }
-
- private:
-  base::WeakPtr<SavePackage> save_package_;
-};
-
 }  // namespace
 
 const base::FilePath::CharType SavePackage::kDefaultHtmlExtension[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("htm");
 #else
     FILE_PATH_LITERAL("html");
 #endif
 
 SavePackage::SavePackage(WebContents* web_contents,
@@ skipping 161 matching lines @@
 
   wait_state_ = START_PROCESS;
 
   // Initialize the request context and resource dispatcher.
   BrowserContext* browser_context = web_contents()->GetBrowserContext();
   if (!browser_context) {
     NOTREACHED();
     return false;
   }
 
-  scoped_ptr<DownloadRequestHandleInterface> request_handle(
-      new SavePackageRequestHandle(AsWeakPtr()));
-  // The download manager keeps ownership but adds us as an observer.
+  scoped_ptr<DownloadSaveInfo> save_info(new DownloadSaveInfo);
+  save_info->file_path = saved_main_file_path_;
+  scoped_ptr<DownloadCreateInfo> create_info(new DownloadCreateInfo);
+  create_info->save_info.swap(save_info);
+  create_info->url_chain.push_back(page_url_);
+  create_info->mime_type = (save_type_ == SAVE_PAGE_TYPE_AS_MHTML)
+                               ? "multipart/related"
+                               : "text/html";
+  create_info->original_mime_type = create_info->mime_type;
+  create_info->route_id =
+      GlobalRoutingID(web_contents()->GetRenderProcessHost()->GetID(),
+                      web_contents()->GetRoutingID());
+
+  // The download manager keeps ownership.
   download_manager_->CreateSavePackageDownloadItem(
-      saved_main_file_path_,
-      page_url_,
-      ((save_type_ == SAVE_PAGE_TYPE_AS_MHTML) ?
-       "multipart/related" : "text/html"),
-      request_handle.Pass(),
-      base::Bind(&SavePackage::InitWithDownloadItem, AsWeakPtr(),
+      create_info.Pass(),
+      base::Bind(&SavePackage::InitWithDownloadItem,
+                 AsWeakPtr(),
                  download_created_callback));
   return true;
 }
 
 void SavePackage::InitWithDownloadItem(
     const SavePackageDownloadCreatedCallback& download_created_callback,
     DownloadItemImpl* item) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(item);
   download_ = item;
@@ skipping 1110 matching lines @@
 
 void SavePackage::FinalizeDownloadEntry() {
   DCHECK(download_);
   DCHECK(download_manager_);
 
   download_manager_->OnSavePackageSuccessfullyFinished(download_);
   StopObservation();
 }
 
 }  // namespace content