Move URLRequestContextGetter to RequestSender in c/b/google_apis.

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 59 matching lines @@
   }
 
   callback.Run(response, file_resource.Pass());
 }
 
 }  // namespace
 
 //============================== GetAboutRequest =============================
 
 GetAboutRequest::GetAboutRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const GetAboutResourceCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetAboutRequest::~GetAboutRequest() {}
 
 GURL GetAboutRequest::GetURL() const {
   return url_generator_.GetAboutUrl();
 }
 
 //============================== GetApplistRequest ===========================
 
 GetApplistRequest::GetApplistRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const GetDataCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetApplistRequest::~GetApplistRequest() {}
 
 GURL GetApplistRequest::GetURL() const {
   return url_generator_.GetApplistUrl();
 }
 
 //============================ GetChangelistRequest ==========================
 
 GetChangelistRequest::GetChangelistRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     bool include_deleted,
     int64 start_changestamp,
     int max_results,
     const GetDataCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_generator_(url_generator),
       include_deleted_(include_deleted),
       start_changestamp_(start_changestamp),
       max_results_(max_results) {
   DCHECK(!callback.is_null());
 }
 
 GetChangelistRequest::~GetChangelistRequest() {}
 
 GURL GetChangelistRequest::GetURL() const {
   return url_generator_.GetChangelistUrl(
       include_deleted_, start_changestamp_, max_results_);
 }
 
 //============================= GetFilelistRequest ===========================
 
 GetFilelistRequest::GetFilelistRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& search_string,
     int max_results,
     const GetDataCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_generator_(url_generator),
       search_string_(search_string),
       max_results_(max_results) {
   DCHECK(!callback.is_null());
 }
 
 GetFilelistRequest::~GetFilelistRequest() {}
 
 GURL GetFilelistRequest::GetURL() const {
   return url_generator_.GetFilelistUrl(search_string_, max_results_);
 }
 
 //=============================== GetFileRequest =============================
 
 GetFileRequest::GetFileRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& file_id,
     const FileResourceCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       file_id_(file_id) {
   DCHECK(!callback.is_null());
 }
 
 GetFileRequest::~GetFileRequest() {}
 
 GURL GetFileRequest::GetURL() const {
   return url_generator_.GetFileUrl(file_id_);
 }
 
 namespace drive {
 
 //======================= ContinueGetFileListRequest =========================
 
 ContinueGetFileListRequest::ContinueGetFileListRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GURL& url,
     const GetDataCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_(url) {
   DCHECK(!callback.is_null());
 }
 
 ContinueGetFileListRequest::~ContinueGetFileListRequest() {}
 
 GURL ContinueGetFileListRequest::GetURL() const {
   return url_;
 }
 
 //========================== CreateDirectoryRequest ==========================
 
 CreateDirectoryRequest::CreateDirectoryRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& parent_resource_id,
     const std::string& directory_name,
     const FileResourceCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       directory_name_(directory_name) {
   DCHECK(!callback.is_null());
   DCHECK(!parent_resource_id_.empty());
   DCHECK(!directory_name_.empty());
 }
 
 CreateDirectoryRequest::~CreateDirectoryRequest() {}
@@ skipping 24 matching lines @@
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "CreateDirectory data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== RenameResourceRequest ==========================
 
 RenameResourceRequest::RenameResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& resource_id,
     const std::string& new_name,
     const EntryActionCallback& callback)
-    : EntryActionRequest(runner, url_request_context_getter, callback),
+    : EntryActionRequest(sender, callback),
       url_generator_(url_generator),
       resource_id_(resource_id),
       new_name_(new_name) {
   DCHECK(!callback.is_null());
 }
 
 RenameResourceRequest::~RenameResourceRequest() {}
 
 net::URLFetcher::RequestType RenameResourceRequest::GetRequestType() const {
   return net::URLFetcher::PATCH;
@@ skipping 19 matching lines @@
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "RenameResource data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== TouchResourceRequest ===========================
 
 TouchResourceRequest::TouchResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& resource_id,
     const base::Time& modified_date,
     const base::Time& last_viewed_by_me_date,
     const FileResourceCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       resource_id_(resource_id),
       modified_date_(modified_date),
       last_viewed_by_me_date_(last_viewed_by_me_date) {
   DCHECK(!modified_date.is_null());
   DCHECK(!last_viewed_by_me_date.is_null());
   DCHECK(!callback.is_null());
 }
 
@@ skipping 25 matching lines @@
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "TouchResource data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== CopyResourceRequest ============================
 
 CopyResourceRequest::CopyResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& resource_id,
     const std::string& parent_resource_id,
     const std::string& new_name,
     const FileResourceCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       resource_id_(resource_id),
       parent_resource_id_(parent_resource_id),
       new_name_(new_name) {
   DCHECK(!callback.is_null());
 }
 
 CopyResourceRequest::~CopyResourceRequest() {
 }
@@ skipping 25 matching lines @@
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "CopyResource data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== TrashResourceRequest ===========================
 
 TrashResourceRequest::TrashResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& resource_id,
     const EntryActionCallback& callback)
-    : EntryActionRequest(runner, url_request_context_getter, callback),
+    : EntryActionRequest(sender, callback),
       url_generator_(url_generator),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 TrashResourceRequest::~TrashResourceRequest() {}
 
 GURL TrashResourceRequest::GetURL() const {
   return url_generator_.GetFileTrashUrl(resource_id_);
 }
 
 net::URLFetcher::RequestType TrashResourceRequest::GetRequestType() const {
   return net::URLFetcher::POST;
 }
 
 //========================== InsertResourceRequest ===========================
 
 InsertResourceRequest::InsertResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& parent_resource_id,
     const std::string& resource_id,
     const EntryActionCallback& callback)
-    : EntryActionRequest(runner, url_request_context_getter, callback),
+    : EntryActionRequest(sender, callback),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 InsertResourceRequest::~InsertResourceRequest() {}
 
 GURL InsertResourceRequest::GetURL() const {
   return url_generator_.GetChildrenUrl(parent_resource_id_);
@@ skipping 12 matching lines @@
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "InsertResource data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //========================== DeleteResourceRequest ===========================
 
 DeleteResourceRequest::DeleteResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const std::string& parent_resource_id,
     const std::string& resource_id,
     const EntryActionCallback& callback)
-    : EntryActionRequest(runner, url_request_context_getter, callback),
+    : EntryActionRequest(sender, callback),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 DeleteResourceRequest::~DeleteResourceRequest() {}
 
 GURL DeleteResourceRequest::GetURL() const {
   return url_generator_.GetChildrenUrlForRemoval(
       parent_resource_id_, resource_id_);
 }
 
 net::URLFetcher::RequestType DeleteResourceRequest::GetRequestType() const {
   return net::URLFetcher::DELETE_REQUEST;
 }
 
 //======================= InitiateUploadNewFileRequest =======================
 
 InitiateUploadNewFileRequest::InitiateUploadNewFileRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     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,
+    : InitiateUploadRequestBase(sender,
                                 callback,
                                 content_type,
                                 content_length),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       title_(title) {
 }
 
 InitiateUploadNewFileRequest::~InitiateUploadNewFileRequest() {}
 
@@ skipping 29 matching lines @@
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "InitiateUploadNewFile data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //===================== InitiateUploadExistingFileRequest ====================
 
 InitiateUploadExistingFileRequest::InitiateUploadExistingFileRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     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,
+    : InitiateUploadRequestBase(sender,
                                 callback,
                                 content_type,
                                 content_length),
       url_generator_(url_generator),
       resource_id_(resource_id),
       etag_(etag) {
 }
 
 InitiateUploadExistingFileRequest::~InitiateUploadExistingFileRequest() {}
 
@@ skipping 10 matching lines @@
 InitiateUploadExistingFileRequest::GetExtraRequestHeaders() const {
   std::vector<std::string> headers(
       InitiateUploadRequestBase::GetExtraRequestHeaders());
   headers.push_back(util::GenerateIfMatchHeader(etag_));
   return headers;
 }
 
 //============================ ResumeUploadRequest ===========================
 
 ResumeUploadRequest::ResumeUploadRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     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,
+    : ResumeUploadRequestBase(sender,
                               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,
+    RequestSender* sender,
     const GURL& upload_url,
     int64 content_length,
     const UploadRangeCallback& callback)
-    : GetUploadStatusRequestBase(runner,
-                                 url_request_context_getter,
+    : GetUploadStatusRequestBase(sender,
                                  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