Merge most instances of DownloadSaveInfo into DownloadUrlParams.

content/public/browser/download_url_parameters.h

 // 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.
 
 #ifndef CONTENT_PUBLIC_BROWSER_DOWNLOAD_URL_PARAMETERS_H_
 #define CONTENT_PUBLIC_BROWSER_DOWNLOAD_URL_PARAMETERS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 28 matching lines @@
 class CONTENT_EXPORT DownloadUrlParameters {
  public:
   // If there is an error, then |item| will be NULL.
   typedef base::Callback<void(DownloadItem*, net::Error)> OnStartedCallback;
 
   typedef std::pair<std::string, std::string> RequestHeadersNameValuePair;
   typedef std::vector<RequestHeadersNameValuePair> RequestHeadersType;
 
   static DownloadUrlParameters* FromWebContents(
       WebContents* web_contents,
-      const GURL& url,
-      scoped_ptr<DownloadSaveInfo> save_info);
+      const GURL& url);
 
   DownloadUrlParameters(
       const GURL& url,
       int render_process_host_id,
       int render_view_host_routing_id,
-      content::ResourceContext* resource_context,
-      scoped_ptr<DownloadSaveInfo> save_info);
+      content::ResourceContext* resource_context);
 
   ~DownloadUrlParameters();
 
   void set_content_initiated(bool content_initiated) {
     content_initiated_ = content_initiated;
   }
   void add_request_header(const std::string& name, const std::string& value) {
     request_headers_.push_back(make_pair(name, value));
   }
   void set_referrer(const Referrer& referrer) { referrer_ = referrer; }
   void set_referrer_encoding(const std::string& referrer_encoding) {
     referrer_encoding_ = referrer_encoding;
   }
   void set_load_flags(int load_flags) { load_flags_ |= load_flags; }
   void set_method(const std::string& method) {
     method_ = method;
   }
   void set_post_body(const std::string& post_body) {
     post_body_ = post_body;
   }
   void set_prefer_cache(bool prefer_cache) {
     prefer_cache_ = prefer_cache;
   }
   void set_post_id(int64 post_id) { post_id_ = post_id; }
   void set_callback(const OnStartedCallback& callback) {
     callback_ = callback;
   }
-
-  // Note that this nulls the internal copy of the DownloadSaveInfo!
-  scoped_ptr<DownloadSaveInfo> GetSaveInfo();
+  void set_file_path(const FilePath& file_path) {
+    save_info_.file_path = file_path;
+  }
+  void set_suggested_name(const string16& suggested_name) {
+    save_info_.suggested_name = suggested_name;
+  }
+  void set_offset(int64 offset) { save_info_.offset = offset; }
+  void set_hash_state(std::string hash_state) {
+    save_info_.hash_state = hash_state;
+  }
+  void set_prompt(bool prompt) { save_info_.prompt_for_save_location = prompt; }
+  void set_file_stream(scoped_ptr<net::FileStream> file_stream) {
+    save_info_.file_stream = file_stream.Pass();
+  }
 
   const OnStartedCallback& callback() const { return callback_; }
   bool content_initiated() const { return content_initiated_; }
   int load_flags() const { return load_flags_; }
   const std::string& method() const { return method_; }
   const std::string& post_body() const { return post_body_; }
   int64 post_id() const { return post_id_; }
   bool prefer_cache() const { return prefer_cache_; }
   const Referrer& referrer() const { return referrer_; }
   const std::string& referrer_encoding() const { return referrer_encoding_; }
   int render_process_host_id() const { return render_process_host_id_; }
   int render_view_host_routing_id() const {
     return render_view_host_routing_id_;
   }
   RequestHeadersType::const_iterator request_headers_begin() const {
     return request_headers_.begin();
   }
   RequestHeadersType::const_iterator request_headers_end() const {
     return request_headers_.end();
   }
   content::ResourceContext* resource_context() const {
     return resource_context_;
   }
   ResourceDispatcherHost* resource_dispatcher_host() const {
     return resource_dispatcher_host_;
   }
+  const FilePath& file_path() const { return save_info_.file_path; }
+  const string16& suggested_name() const { return save_info_.suggested_name; }
+  int64 offset() const { return save_info_.offset; }
+  const std::string& hash_state() const { return save_info_.hash_state; }
+  bool prompt() const { return save_info_.prompt_for_save_location; }
   const GURL& url() const { return url_; }
 
+  // Note that this is state changing--the DownloadUrlParameters object
+  // will not have a file_stream attached to it after this call.
+  scoped_ptr<net::FileStream> GetFileStream() {
+    return save_info_.file_stream.Pass();
+  }
+
  private:
   OnStartedCallback callback_;
   bool content_initiated_;
   RequestHeadersType request_headers_;
   int load_flags_;
   std::string method_;
   std::string post_body_;
   int64 post_id_;
   bool prefer_cache_;
   Referrer referrer_;
   std::string referrer_encoding_;
   int render_process_host_id_;
   int render_view_host_routing_id_;
   ResourceContext* resource_context_;
   ResourceDispatcherHost* resource_dispatcher_host_;
-  scoped_ptr<DownloadSaveInfo> save_info_;
+  DownloadSaveInfo save_info_;
   GURL url_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadUrlParameters);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DOWNLOAD_URL_PARAMETERS_H_