Implement MoveResourceRequest on Drive API v2.

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 47 matching lines @@
 using google_apis::UploadRangeResponse;
 using google_apis::drive::ContinueGetFileListRequest;
 using google_apis::drive::CopyResourceRequest;
 using google_apis::drive::CreateDirectoryRequest;
 using google_apis::drive::DeleteResourceRequest;
 using google_apis::drive::DownloadFileRequest;
 using google_apis::drive::GetUploadStatusRequest;
 using google_apis::drive::InitiateUploadExistingFileRequest;
 using google_apis::drive::InitiateUploadNewFileRequest;
 using google_apis::drive::InsertResourceRequest;
-using google_apis::drive::RenameResourceRequest;
+using google_apis::drive::MoveResourceRequest;
 using google_apis::drive::ResumeUploadRequest;
 using google_apis::drive::TouchResourceRequest;
 using google_apis::drive::TrashResourceRequest;
 
 namespace drive {
 
 namespace {
 
 // OAuth2 scopes for Drive API.
 const char kDriveScope[] = "https://www.googleapis.com/auth/drive";
@@ skipping 173 matching lines @@
     if (open_with_links[i].app_id == app_id) {
       callback.Run(HTTP_SUCCESS, open_with_links[i].open_url);
       return;
     }
   }
 
   // Not found.
   callback.Run(GDATA_OTHER_ERROR, GURL());
 }
 
+// Ignores the |entry|, and runs the |callback|.
+void EntryActionCallbackAdapter(
+    const EntryActionCallback& callback,
+    GDataErrorCode error, scoped_ptr<FileResource> entry) {
+  callback.Run(error);
+}
+
 // The resource ID for the root directory for Drive API is defined in the spec:
 // https://developers.google.com/drive/folder
 const char kDriveApiRootDirectoryResourceId[] = "root";
 
 }  // namespace
 
 DriveAPIService::DriveAPIService(
     OAuth2TokenService* oauth2_token_service,
     net::URLRequestContextGetter* url_request_context_getter,
     base::TaskRunner* blocking_task_runner,
@@ skipping 329 matching lines @@
 }
 
 CancelCallback DriveAPIService::MoveResource(
     const std::string& resource_id,
     const std::string& parent_resource_id,
     const std::string& new_title,
     const GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
-  // TODO(hidehiko): Implement this.
-  NOTIMPLEMENTED();
-  return CancelCallback();
+  return sender_->StartRequestWithRetry(
+      new MoveResourceRequest(
+          sender_.get(),
+          url_generator_,
+          resource_id,
+          parent_resource_id,
+          new_title,
+          base::Bind(&ParseResourceEntryAndRun, callback)));
 }
 
 CancelCallback DriveAPIService::RenameResource(
     const std::string& resource_id,
     const std::string& new_title,
     const EntryActionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!callback.is_null());
 
   return sender_->StartRequestWithRetry(
-      new RenameResourceRequest(
+      new MoveResourceRequest(
           sender_.get(),
           url_generator_,
           resource_id,
+          std::string(),
           new_title,
-          callback));
+          base::Bind(&EntryActionCallbackAdapter, callback)));
 }
 
 CancelCallback DriveAPIService::TouchResource(
     const std::string& resource_id,
     const base::Time& modified_date,
     const base::Time& last_viewed_by_me_date,
     const GetResourceEntryCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(!modified_date.is_null());
   DCHECK(!last_viewed_by_me_date.is_null());
@@ skipping 173 matching lines @@
   if (CanSendRequest()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnReadyToSendRequests());
   } else if (!HasRefreshToken()) {
     FOR_EACH_OBSERVER(
         DriveServiceObserver, observers_, OnRefreshTokenInvalid());
   }
 }
 
 }  // namespace drive