Updates to DownloadUrlParameters in preparation for OOPIF changes

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 <stdint.h>
 
 #include <memory>
@@ skipping 43 matching lines @@
   // are not created when a resource throttle or a resource handler blocks the
   // download request. I.e. the download triggered a warning of some sort and
   // the user chose to not to proceed with the download as a result.
   typedef base::Callback<void(DownloadItem*, DownloadInterruptReason)>
       OnStartedCallback;
 
   typedef std::pair<std::string, std::string> RequestHeadersNameValuePair;
   typedef std::vector<RequestHeadersNameValuePair> RequestHeadersType;
 
   // Construct DownloadUrlParameters for downloading the resource at |url| and
-  // associating the download with |web_contents|.
-  //
-  // DEPRECATED: Using this method can cause the request to be associated with
-  // the wrong site instance where multiple iframes are involved. Use the
-  // DownloadUrlParameters constructor below and specify the process and frame
-  // IDs explicitly.
-  static std::unique_ptr<DownloadUrlParameters> FromWebContents(
+  // associating the download with the main frame of the given WebContents.
+  static std::unique_ptr<DownloadUrlParameters> CreateForWebContentsMainFrame(
       WebContents* web_contents,
       const GURL& url);
 
-  // Construct DownloadUrlParameters for downloading the resource at |url| and
-  // associating the download with the WebContents identified by
-  // |render_process_host_id| and |render_view_host_routing_id|.
+  // Constructs a download not associated with a frame.
   //
-  // If the download is not associated with a WebContents, then set the IDs to
-  // -1.
-  //
-  // NOTE: Initiating downloads that are not associated with a WebContents is
-  // not safe and should only be done in a limited set of cases where the
-  // download URL has been previously vetted. A download that's initiated
-  // without associating it with a WebContents don't receive the same security
-  // checks as a request that's associated with one. Hence, downloads that are
-  // not associated with a WebContents should only be made for URLs that are
-  // either trusted or URLs that have previously been successfully issued using
-  // a non-privileged WebContents.
+  // It is not safe to have downloads not associated with a frame and
+  // this should only be done in a limited set of cases where the download URL
+  // has been previously vetted. A download that's initiated without
+  // associating it with a frame don't receive the same security checks
+  // as a request that's associated with one. Hence, downloads that are not
+  // associated with a frame should only be made for URLs that are either
+  // trusted or URLs that have previously been successfully issued using a
+  // non-privileged frame.
+  DownloadUrlParameters(
+      const GURL& url,
+      net::URLRequestContextGetter* url_request_context_getter);
+
+  // The RenderView routing ID must correspond to the RenderView of the
+  // RenderFrame, both of which share the same RenderProcess. This may be a
+  // different RenderView than the WebContents' main RenderView.
   DownloadUrlParameters(
       const GURL& url,
       int render_process_host_id,
       int render_view_host_routing_id,
       int render_frame_host_routing_id,
       net::URLRequestContextGetter* url_request_context_getter);
 
   ~DownloadUrlParameters();
 
   // Should be set to true if the download was initiated by a script or a web
@@ skipping 108 matching lines @@
   const OnStartedCallback& callback() const { return callback_; }
   bool content_initiated() const { return content_initiated_; }
   const std::string& last_modified() const { return last_modified_; }
   const std::string& etag() const { return etag_; }
   const std::string& method() const { return method_; }
   const std::string& post_body() const { return post_body_; }
   int64_t 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_; }
+
+  // These will be -1 if the request is not associated with a frame. See
+  // the constructors for more.
   int render_process_host_id() const { return render_process_host_id_; }
   int render_view_host_routing_id() const {
     return render_view_host_routing_id_;
   }
   int render_frame_host_routing_id() const {
     return render_frame_host_routing_id_;
   }
+
   const RequestHeadersType& request_headers() const { return request_headers_; }
   net::URLRequestContextGetter* url_request_context_getter() {
     return url_request_context_getter_.get();
   }
   const base::FilePath& file_path() const { return save_info_.file_path; }
   const base::string16& suggested_name() const {
     return save_info_.suggested_name;
   }
   int64_t offset() const { return save_info_.offset; }
   const std::string& hash_of_partial_file() const {
@@ skipping 32 matching lines @@
   GURL url_;
   bool do_not_prompt_for_login_;
   std::unique_ptr<storage::BlobDataHandle> blob_data_handle_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadUrlParameters);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_DOWNLOAD_URL_PARAMETERS_H_