Move URLRequestContextGetter to RequestSender in c/b/google_apis.

chrome/browser/google_apis/gdata_wapi_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/gdata_wapi_requests.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
@@ skipping 141 matching lines @@
     error = GDATA_OTHER_ERROR;
 
   callback.Run(error, open_link);
 }
 
 }  // namespace
 
 //============================ GetResourceListRequest ========================
 
 GetResourceListRequest::GetResourceListRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const GURL& override_url,
     int64 start_changestamp,
     const std::string& search_string,
     const std::string& directory_resource_id,
     const GetResourceListCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseResourceListAndRun, callback)),
       url_generator_(url_generator),
       override_url_(override_url),
       start_changestamp_(start_changestamp),
       search_string_(search_string),
       directory_resource_id_(directory_resource_id) {
   DCHECK(!callback.is_null());
 }
 
 GetResourceListRequest::~GetResourceListRequest() {}
 
 GURL GetResourceListRequest::GetURL() const {
   return url_generator_.GenerateResourceListUrl(override_url_,
                                                 start_changestamp_,
                                                 search_string_,
                                                 directory_resource_id_);
 }
 
 //============================ SearchByTitleRequest ==========================
 
 SearchByTitleRequest::SearchByTitleRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const std::string& title,
     const std::string& directory_resource_id,
     const GetResourceListCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseResourceListAndRun, callback)),
       url_generator_(url_generator),
       title_(title),
       directory_resource_id_(directory_resource_id) {
   DCHECK(!callback.is_null());
 }
 
 SearchByTitleRequest::~SearchByTitleRequest() {}
 
 GURL SearchByTitleRequest::GetURL() const {
   return url_generator_.GenerateSearchByTitleUrl(
       title_, directory_resource_id_);
 }
 
 //============================ GetResourceEntryRequest =======================
 
 GetResourceEntryRequest::GetResourceEntryRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const std::string& resource_id,
     const GetDataCallback& callback)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_generator_(url_generator),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 GetResourceEntryRequest::~GetResourceEntryRequest() {}
 
 GURL GetResourceEntryRequest::GetURL() const {
   return url_generator_.GenerateEditUrl(resource_id_);
 }
 
 //========================= GetAccountMetadataRequest ========================
 
 GetAccountMetadataRequest::GetAccountMetadataRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const GetAccountMetadataCallback& callback,
     bool include_installed_apps)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseAccounetMetadataAndRun, callback)),
       url_generator_(url_generator),
       include_installed_apps_(include_installed_apps) {
   DCHECK(!callback.is_null());
 }
 
 GetAccountMetadataRequest::~GetAccountMetadataRequest() {}
 
 GURL GetAccountMetadataRequest::GetURL() const {
   return url_generator_.GenerateAccountMetadataUrl(include_installed_apps_);
 }
 
 //=========================== DeleteResourceRequest ==========================
 
 DeleteResourceRequest::DeleteResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const EntryActionCallback& callback,
     const std::string& resource_id,
     const std::string& etag)
-    : EntryActionRequest(runner, url_request_context_getter, callback),
+    : EntryActionRequest(sender, callback),
       url_generator_(url_generator),
       resource_id_(resource_id),
       etag_(etag) {
   DCHECK(!callback.is_null());
 }
 
 DeleteResourceRequest::~DeleteResourceRequest() {}
 
 GURL DeleteResourceRequest::GetURL() const {
   return url_generator_.GenerateEditUrl(resource_id_);
 }
 
 URLFetcher::RequestType DeleteResourceRequest::GetRequestType() const {
   return URLFetcher::DELETE_REQUEST;
 }
 
 std::vector<std::string>
 DeleteResourceRequest::GetExtraRequestHeaders() const {
   std::vector<std::string> headers;
   headers.push_back(util::GenerateIfMatchHeader(etag_));
   return headers;
 }
 
 //========================== CreateDirectoryRequest ==========================
 
 CreateDirectoryRequest::CreateDirectoryRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const GetDataCallback& callback,
     const std::string& parent_resource_id,
     const std::string& directory_name)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       directory_name_(directory_name) {
   DCHECK(!callback.is_null());
 }
 
 CreateDirectoryRequest::~CreateDirectoryRequest() {}
 
 GURL CreateDirectoryRequest::GetURL() const {
   return url_generator_.GenerateContentUrl(parent_resource_id_);
@@ skipping 25 matching lines @@
   xml_writer.StopWriting();
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "CreateDirectory data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //============================ CopyHostedDocumentRequest =====================
 
 CopyHostedDocumentRequest::CopyHostedDocumentRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const GetDataCallback& callback,
     const std::string& resource_id,
     const std::string& new_name)
-    : GetDataRequest(runner, url_request_context_getter, callback),
+    : GetDataRequest(sender, callback),
       url_generator_(url_generator),
       resource_id_(resource_id),
       new_name_(new_name) {
   DCHECK(!callback.is_null());
 }
 
 CopyHostedDocumentRequest::~CopyHostedDocumentRequest() {}
 
 URLFetcher::RequestType CopyHostedDocumentRequest::GetRequestType() const {
   return URLFetcher::POST;
@@ skipping 19 matching lines @@
   xml_writer.StopWriting();
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "CopyHostedDocumentRequest data: " << *upload_content_type
            << ", [" << *upload_content << "]";
   return true;
 }
 
 //=========================== RenameResourceRequest ==========================
 
 RenameResourceRequest::RenameResourceRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const EntryActionCallback& callback,
     const std::string& resource_id,
     const std::string& new_name)
-    : 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() {}
 
 URLFetcher::RequestType RenameResourceRequest::GetRequestType() const {
   return URLFetcher::PUT;
@@ skipping 24 matching lines @@
   xml_writer.StopWriting();
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "RenameResourceRequest data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== AuthorizeAppRequest ==========================
 
 AuthorizeAppRequest::AuthorizeAppRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const AuthorizeAppCallback& callback,
     const std::string& resource_id,
     const std::string& app_id)
-    : GetDataRequest(runner, url_request_context_getter,
+    : GetDataRequest(sender,
                      base::Bind(&ParseOpenLinkAndRun, app_id, callback)),
       url_generator_(url_generator),
       resource_id_(resource_id),
       app_id_(app_id) {
   DCHECK(!callback.is_null());
 }
 
 AuthorizeAppRequest::~AuthorizeAppRequest() {}
 
 URLFetcher::RequestType AuthorizeAppRequest::GetRequestType() const {
@@ skipping 25 matching lines @@
   return true;
 }
 
 GURL AuthorizeAppRequest::GetURL() const {
   return url_generator_.GenerateEditUrl(resource_id_);
 }
 
 //======================= AddResourceToDirectoryRequest ======================
 
 AddResourceToDirectoryRequest::AddResourceToDirectoryRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const EntryActionCallback& callback,
     const std::string& parent_resource_id,
     const std::string& resource_id)
-    : 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());
 }
 
 AddResourceToDirectoryRequest::~AddResourceToDirectoryRequest() {}
 
 GURL AddResourceToDirectoryRequest::GetURL() const {
   return url_generator_.GenerateContentUrl(parent_resource_id_);
@@ skipping 19 matching lines @@
   xml_writer.StopWriting();
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "AddResourceToDirectoryRequest data: " << *upload_content_type
            << ", [" << *upload_content << "]";
   return true;
 }
 
 //==================== RemoveResourceFromDirectoryRequest ====================
 
 RemoveResourceFromDirectoryRequest::RemoveResourceFromDirectoryRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const EntryActionCallback& callback,
     const std::string& parent_resource_id,
     const std::string& document_resource_id)
-    : EntryActionRequest(runner, url_request_context_getter, callback),
+    : EntryActionRequest(sender, callback),
       url_generator_(url_generator),
       resource_id_(document_resource_id),
       parent_resource_id_(parent_resource_id) {
   DCHECK(!callback.is_null());
 }
 
 RemoveResourceFromDirectoryRequest::~RemoveResourceFromDirectoryRequest() {
 }
 
 GURL RemoveResourceFromDirectoryRequest::GetURL() const {
   return url_generator_.GenerateResourceUrlForRemoval(
       parent_resource_id_, resource_id_);
 }
 
 URLFetcher::RequestType
 RemoveResourceFromDirectoryRequest::GetRequestType() const {
   return URLFetcher::DELETE_REQUEST;
 }
 
 std::vector<std::string>
 RemoveResourceFromDirectoryRequest::GetExtraRequestHeaders() const {
   std::vector<std::string> headers;
   headers.push_back(util::kIfMatchAllHeader);
   return headers;
 }
 
 //======================= InitiateUploadNewFileRequest =======================
 
 InitiateUploadNewFileRequest::InitiateUploadNewFileRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const InitiateUploadCallback& callback,
     const std::string& content_type,
     int64 content_length,
     const std::string& parent_resource_id,
     const std::string& title)
-    : 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 21 matching lines @@
   xml_writer.StopWriting();
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "InitiateUploadNewFile: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //===================== InitiateUploadExistingFileRequest ====================
 
 InitiateUploadExistingFileRequest::InitiateUploadExistingFileRequest(
-    RequestSender* runner,
-    net::URLRequestContextGetter* url_request_context_getter,
+    RequestSender* sender,
     const GDataWapiUrlGenerator& url_generator,
     const InitiateUploadCallback& callback,
     const std::string& content_type,
     int64 content_length,
     const std::string& resource_id,
     const std::string& etag)
-    : 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 22 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 UploadRangeCallback& callback,
     const ProgressCallback& progress_callback,
     const GURL& upload_location,
     int64 start_position,
     int64 end_position,
     int64 content_length,
     const std::string& content_type,
     const base::FilePath& local_file_path)
-    : 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) {
   callback_.Run(response, ParseResourceEntry(value.Pass()));
 }
 
 void ResumeUploadRequest::OnURLFetchUploadProgress(
     const 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 UploadRangeCallback& callback,
     const GURL& upload_url,
     int64 content_length)
-    : GetUploadStatusRequestBase(runner,
-                                 url_request_context_getter,
-                                 upload_url,
-                                 content_length),
+    : 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) {
   callback_.Run(response, ParseResourceEntry(value.Pass()));
 }
 
 }  // namespace google_apis