Misc clean up for Drive API service and requests.

chrome/browser/drive/drive_api_service.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/drive/drive_api_service.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 40 matching lines @@
 using google_apis::ResourceEntry;
 using google_apis::ResourceList;
 using google_apis::UploadRangeCallback;
 using google_apis::UploadRangeResponse;
 using google_apis::drive::AboutGetRequest;
 using google_apis::drive::AppsListRequest;
 using google_apis::drive::ChangesListRequest;
 using google_apis::drive::ChangesListNextPageRequest;
 using google_apis::drive::ChildrenDeleteRequest;
 using google_apis::drive::ChildrenInsertRequest;
-using google_apis::drive::ContinueGetFileListRequest;
 using google_apis::drive::DownloadFileRequest;
 using google_apis::drive::FilesCopyRequest;
 using google_apis::drive::FilesGetRequest;
 using google_apis::drive::FilesInsertRequest;
 using google_apis::drive::FilesPatchRequest;
 using google_apis::drive::FilesListRequest;
 using google_apis::drive::FilesListNextPageRequest;
 using google_apis::drive::FilesTrashRequest;
 using google_apis::drive::GetUploadStatusRequest;
 using google_apis::drive::InitiateUploadExistingFileRequest;
@@ skipping 12 matching lines @@
 // Mime type to create a directory.
 const char kFolderMimeType[] = "application/vnd.google-apps.folder";
 
 // Expected max number of files resources in a http request.
 // Be careful not to use something too small because it might overload the
 // server. Be careful not to use something too large because it takes longer
 // time to fetch the result without UI response.
 const int kMaxNumFilesResourcePerRequest = 500;
 const int kMaxNumFilesResourcePerRequestForSearch = 50;
 
-scoped_ptr<ResourceList> ParseChangeListJsonToResourceList(
-    scoped_ptr<base::Value> value) {
-  scoped_ptr<ChangeList> change_list(ChangeList::CreateFrom(*value));
-  if (!change_list) {
-    return scoped_ptr<ResourceList>();
-  }
-
-  return ResourceList::CreateFromChangeList(*change_list);
-}
-
-scoped_ptr<ResourceList> ParseFileListJsonToResourceList(
-    scoped_ptr<base::Value> value) {
-  scoped_ptr<FileList> file_list(FileList::CreateFrom(*value));
-  if (!file_list) {
-    return scoped_ptr<ResourceList>();
-  }
-
-  return ResourceList::CreateFromFileList(*file_list);
-}
-
-// Parses JSON value representing either ChangeList or FileList into
-// ResourceList.
-scoped_ptr<ResourceList> ParseResourceListOnBlockingPool(
-    scoped_ptr<base::Value> value) {
-  DCHECK(value);
-
-  // Dispatch the parsing based on kind field.
-  if (ChangeList::HasChangeListKind(*value)) {
-    return ParseChangeListJsonToResourceList(value.Pass());
-  }
-  if (FileList::HasFileListKind(*value)) {
-    return ParseFileListJsonToResourceList(value.Pass());
-  }
-
-  // The value type is unknown, so give up to parse and return an error.
-  return scoped_ptr<ResourceList>();
-}
-
 // Callback invoked when the parsing of resource list is completed,
 // regardless whether it is succeeded or not.
-void DidParseResourceListOnBlockingPool(
+void DidConvertToResourceListOnBlockingPool(
     const GetResourceListCallback& callback,
     scoped_ptr<ResourceList> resource_list) {
   GDataErrorCode error = resource_list ? HTTP_SUCCESS : GDATA_PARSE_ERROR;
   callback.Run(error, resource_list.Pass());
 }
 
-// Sends a task to parse the JSON value into ResourceList on blocking pool,
-// with a callback which is called when the task is done.
-void ParseResourceListOnBlockingPoolAndRun(
-    scoped_refptr<base::TaskRunner> blocking_task_runner,
-    const GetResourceListCallback& callback,
-    GDataErrorCode error,
-    scoped_ptr<base::Value> value) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!callback.is_null());
-
-  if (error != HTTP_SUCCESS) {
-    // An error occurs, so run callback immediately.
-    callback.Run(error, scoped_ptr<ResourceList>());
-    return;
-  }
-
-  base::PostTaskAndReplyWithResult(
-      blocking_task_runner.get(),
-      FROM_HERE,
-      base::Bind(&ParseResourceListOnBlockingPool, base::Passed(&value)),
-      base::Bind(&DidParseResourceListOnBlockingPool, callback));
-}
-
 // Converts the FileResource value to ResourceEntry and runs |callback| on the
 // UI thread.
 void ConvertFileEntryToResourceEntryAndRun(
     const GetResourceEntryCallback& callback,
     GDataErrorCode error,
     scoped_ptr<FileResource> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (!value) {
@@ skipping 31 matching lines @@
   if (!value) {
     callback.Run(error, scoped_ptr<ResourceList>());
     return;
   }
 
   // Convert the value on blocking pool.
   base::PostTaskAndReplyWithResult(
       blocking_task_runner.get(),
       FROM_HERE,
       base::Bind(&ConvertFileListToResourceList, base::Passed(&value)),
-      base::Bind(&DidParseResourceListOnBlockingPool, callback));
+      base::Bind(&DidConvertToResourceListOnBlockingPool, callback));
 }
 
 // Thin adapter of CreateFromChangeList.
 scoped_ptr<ResourceList> ConvertChangeListToResourceList(
     scoped_ptr<ChangeList> change_list) {
   return ResourceList::CreateFromChangeList(*change_list);
 }
 
 // Converts the FileList value to ResourceList on blocking pool and runs
 // |callback| on the UI thread.
 void ConvertChangeListToResourceListOnBlockingPoolAndRun(
     scoped_refptr<base::TaskRunner> blocking_task_runner,
     const GetResourceListCallback& callback,
     GDataErrorCode error,
     scoped_ptr<ChangeList> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (!value) {
     callback.Run(error, scoped_ptr<ResourceList>());
     return;
   }
 
   // Convert the value on blocking pool.
   base::PostTaskAndReplyWithResult(
       blocking_task_runner.get(),
       FROM_HERE,
       base::Bind(&ConvertChangeListToResourceList, base::Passed(&value)),
-      base::Bind(&DidParseResourceListOnBlockingPool, callback));
+      base::Bind(&DidConvertToResourceListOnBlockingPool, callback));
 }
 
-// Parses the FileResource value to ResourceEntry for upload range request,
+// Converts the FileResource value to ResourceEntry for upload range request,
 // and runs |callback| on the UI thread.
-void ParseResourceEntryForUploadRangeAndRun(
+void ConvertFileResourceToResourceEntryForUploadRangeAndRun(
     const UploadRangeCallback& callback,
     const UploadRangeResponse& response,
     scoped_ptr<FileResource> value) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   if (!value) {
     callback.Run(response, scoped_ptr<ResourceEntry>());
     return;
   }
@@ skipping 521 matching lines @@
 
   return sender_->StartRequestWithRetry(
       new ResumeUploadRequest(
           sender_.get(),
           upload_url,
           start_position,
           end_position,
           content_length,
           content_type,
           local_file_path,
-          base::Bind(&ParseResourceEntryForUploadRangeAndRun, callback),
+          base::Bind(&ConvertFileResourceToResourceEntryForUploadRangeAndRun,
+                     callback),
           progress_callback));
 }
 
 CancelCallback DriveAPIService::GetUploadStatus(
     const GURL& upload_url,
     int64 content_length,
     const UploadRangeCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(new GetUploadStatusRequest(
       sender_.get(),
       upload_url,
       content_length,
-      base::Bind(&ParseResourceEntryForUploadRangeAndRun, callback)));
+      base::Bind(&ConvertFileResourceToResourceEntryForUploadRangeAndRun,
+                 callback)));
 }
 
 CancelCallback DriveAPIService::AuthorizeApp(
     const std::string& resource_id,
     const std::string& app_id,
     const AuthorizeAppCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   FilesGetRequest* request = new FilesGetRequest(
@@ skipping 76 matching lines @@
   if (CanSendRequest()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToSendRequests());
   } else if (!HasRefreshToken()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnRefreshTokenInvalid());
   }
 }
 
 }  // namespace drive