Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1571)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/google_apis/drive_api_requests.cc

Issue 18316002: Move URLRequestContextGetter to RequestSender in c/b/google_apis. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/google_apis/drive_api_requests.h ('k') | chrome/browser/google_apis/drive_api_requests_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/drive_api_requests.cc
diff --git a/chrome/browser/google_apis/drive_api_requests.cc b/chrome/browser/google_apis/drive_api_requests.cc
index 6f69121ab1974d6dbd170a30cabc2165bb4216c3..a0dcd4deda0fbbc8eb720ffdc76c1a231deb0b7c 100644
--- a/chrome/browser/google_apis/drive_api_requests.cc
+++ b/chrome/browser/google_apis/drive_api_requests.cc
@@ -77,11 +77,10 @@ void ParseFileResourceWithUploadRangeAndRun(
//============================== 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());
@@ -96,11 +95,10 @@ GURL GetAboutRequest::GetURL() const {
//============================== 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());
}
@@ -114,14 +112,13 @@ GURL GetApplistRequest::GetURL() const {
//============================ 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),
@@ -139,13 +136,12 @@ GURL GetChangelistRequest::GetURL() const {
//============================= 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) {
@@ -161,12 +157,11 @@ GURL GetFilelistRequest::GetURL() const {
//=============================== 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) {
@@ -184,11 +179,10 @@ 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());
}
@@ -202,13 +196,12 @@ GURL ContinueGetFileListRequest::GetURL() const {
//========================== 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),
@@ -253,13 +246,12 @@ bool CreateDirectoryRequest::GetContentData(std::string* upload_content_type,
//=========================== 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) {
@@ -299,14 +291,13 @@ bool RenameResourceRequest::GetContentData(std::string* upload_content_type,
//=========================== 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),
@@ -352,14 +343,13 @@ bool TouchResourceRequest::GetContentData(std::string* upload_content_type,
//=========================== 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),
@@ -405,12 +395,11 @@ bool CopyResourceRequest::GetContentData(std::string* upload_content_type,
//=========================== 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());
@@ -429,13 +418,12 @@ net::URLFetcher::RequestType TrashResourceRequest::GetRequestType() const {
//========================== 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) {
@@ -468,13 +456,12 @@ bool InsertResourceRequest::GetContentData(std::string* upload_content_type,
//========================== 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) {
@@ -495,16 +482,14 @@ net::URLFetcher::RequestType DeleteResourceRequest::GetRequestType() const {
//======================= 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),
@@ -554,16 +539,14 @@ bool InitiateUploadNewFileRequest::GetContentData(
//===================== 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),
@@ -594,8 +577,7 @@ InitiateUploadExistingFileRequest::GetExtraRequestHeaders() const {
//============================ ResumeUploadRequest ===========================
ResumeUploadRequest::ResumeUploadRequest(
- RequestSender* runner,
- net::URLRequestContextGetter* url_request_context_getter,
+ RequestSender* sender,
const GURL& upload_location,
int64 start_position,
int64 end_position,
@@ -604,8 +586,7 @@ ResumeUploadRequest::ResumeUploadRequest(
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,
@@ -633,13 +614,11 @@ void ResumeUploadRequest::OnURLFetchUploadProgress(
//========================== 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) {
« no previous file with comments | « chrome/browser/google_apis/drive_api_requests.h ('k') | chrome/browser/google_apis/drive_api_requests_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698