Get rid of RequestRegistry (part 3): remove Drive path from request objects.

chrome/browser/google_apis/drive_api_requests.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 "chrome/browser/google_apis/drive_api_requests.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 480 matching lines @@
 net::URLFetcher::RequestType DeleteResourceRequest::GetRequestType() const {
   return net::URLFetcher::DELETE_REQUEST;
 }
 
 //======================= InitiateUploadNewFileRequest =======================
 
 InitiateUploadNewFileRequest::InitiateUploadNewFileRequest(
     RequestSender* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
-    const base::FilePath& drive_file_path,
     const std::string& content_type,
     int64 content_length,
     const std::string& parent_resource_id,
     const std::string& title,
     const InitiateUploadCallback& callback)
     : InitiateUploadRequestBase(runner,
                                 url_request_context_getter,
                                 callback,
-                                drive_file_path,
                                 content_type,
                                 content_length),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       title_(title) {
 }
 
 InitiateUploadNewFileRequest::~InitiateUploadNewFileRequest() {}
 
 GURL InitiateUploadNewFileRequest::GetURL() const {
@@ skipping 31 matching lines @@
            << *upload_content << "]";
   return true;
 }
 
 //===================== InitiateUploadExistingFileRequest ====================
 
 InitiateUploadExistingFileRequest::InitiateUploadExistingFileRequest(
     RequestSender* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
-    const base::FilePath& drive_file_path,
     const std::string& content_type,
     int64 content_length,
     const std::string& resource_id,
     const std::string& etag,
     const InitiateUploadCallback& callback)
     : InitiateUploadRequestBase(runner,
                                 url_request_context_getter,
                                 callback,
-                                drive_file_path,
                                 content_type,
                                 content_length),
       url_generator_(url_generator),
       resource_id_(resource_id),
       etag_(etag) {
 }
 
 InitiateUploadExistingFileRequest::~InitiateUploadExistingFileRequest() {}
 
 GURL InitiateUploadExistingFileRequest::GetURL() const {
@@ skipping 11 matching lines @@
       InitiateUploadRequestBase::GetExtraRequestHeaders());
   headers.push_back(util::GenerateIfMatchHeader(etag_));
   return headers;
 }
 
 //============================ ResumeUploadRequest ===========================
 
 ResumeUploadRequest::ResumeUploadRequest(
     RequestSender* runner,
     net::URLRequestContextGetter* url_request_context_getter,
-    const base::FilePath& drive_file_path,
     const GURL& upload_location,
     int64 start_position,
     int64 end_position,
     int64 content_length,
     const std::string& content_type,
     const base::FilePath& local_file_path,
     const UploadRangeCallback& callback,
     const ProgressCallback& progress_callback)
     : ResumeUploadRequestBase(runner,
                               url_request_context_getter,
-                              drive_file_path,
                               upload_location,
                               start_position,
                               end_position,
                               content_length,
                               content_type,
                               local_file_path),
       callback_(callback),
       progress_callback_(progress_callback) {
   DCHECK(!callback_.is_null());
 }
 
 ResumeUploadRequest::~ResumeUploadRequest() {}
 
 void ResumeUploadRequest::OnRangeRequestComplete(
     const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
   ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass());
 }
 
 void ResumeUploadRequest::OnURLFetchUploadProgress(
     const net::URLFetcher* source, int64 current, int64 total) {
   if (!progress_callback_.is_null())
     progress_callback_.Run(current, total);
 }
 
 //========================== GetUploadStatusRequest ==========================
 
 GetUploadStatusRequest::GetUploadStatusRequest(
     RequestSender* runner,
     net::URLRequestContextGetter* url_request_context_getter,
-    const base::FilePath& drive_file_path,
     const GURL& upload_url,
     int64 content_length,
     const UploadRangeCallback& callback)
     : GetUploadStatusRequestBase(runner,
                                  url_request_context_getter,
-                                 drive_file_path,
                                  upload_url,
                                  content_length),
       callback_(callback) {
   DCHECK(!callback.is_null());
 }
 
 GetUploadStatusRequest::~GetUploadStatusRequest() {}
 
 void GetUploadStatusRequest::OnRangeRequestComplete(
     const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
   ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass());
 }
 
 }  // namespace drive
 }  // namespace google_apis