drive: Deal with the root directory in the same way as others in MoveOperation.

chrome/browser/google_apis/gdata_wapi_operations.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_operations.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/google_apis/gdata_wapi_parser.h"
@@ skipping 471 matching lines @@
     : EntryActionOperation(registry, url_request_context_getter, callback),
       url_generator_(url_generator),
       parent_content_url_(parent_content_url),
       edit_url_(edit_url) {
   DCHECK(!callback.is_null());
 }
 
 AddResourceToDirectoryOperation::~AddResourceToDirectoryOperation() {}
 
 GURL AddResourceToDirectoryOperation::GetURL() const {
-  if (!parent_content_url_.is_empty())
-    return GDataWapiUrlGenerator::AddStandardUrlParams(parent_content_url_);
-
-  return url_generator_.GenerateResourceListRootUrl();
+  GURL parent = parent_content_url_.is_empty() ?
+      url_generator_.GenerateRootContentUrl() : parent_content_url_;
+  return GDataWapiUrlGenerator::AddStandardUrlParams(parent);
 }
 
 URLFetcher::RequestType
 AddResourceToDirectoryOperation::GetRequestType() const {
   return URLFetcher::POST;
 }
 
 bool AddResourceToDirectoryOperation::GetContentData(
     std::string* upload_content_type, std::string* upload_content) {
   upload_content_type->assign("application/atom+xml");
@@ skipping 10 matching lines @@
   DVLOG(1) << "AddResourceToDirectoryOperation data: " << *upload_content_type
            << ", [" << *upload_content << "]";
   return true;
 }
 
 //==================== RemoveResourceFromDirectoryOperation ====================
 
 RemoveResourceFromDirectoryOperation::RemoveResourceFromDirectoryOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
+    const GDataWapiUrlGenerator& url_generator,
     const EntryActionCallback& callback,
     const GURL& parent_content_url,
     const std::string& document_resource_id)
     : EntryActionOperation(registry, url_request_context_getter, callback),
+      url_generator_(url_generator),
       resource_id_(document_resource_id),
       parent_content_url_(parent_content_url) {
   DCHECK(!callback.is_null());
 }
 
 RemoveResourceFromDirectoryOperation::~RemoveResourceFromDirectoryOperation() {
 }
 
 GURL RemoveResourceFromDirectoryOperation::GetURL() const {
+  GURL parent = parent_content_url_.is_empty() ?
+      url_generator_.GenerateRootContentUrl() : parent_content_url_;
+
   std::string escaped_resource_id = net::EscapePath(resource_id_);
   GURL edit_url(base::StringPrintf("%s/%s",
-                                   parent_content_url_.spec().c_str(),
+                                   parent.spec().c_str(),
                                    escaped_resource_id.c_str()));
   return GDataWapiUrlGenerator::AddStandardUrlParams(edit_url);
 }
 
 URLFetcher::RequestType
 RemoveResourceFromDirectoryOperation::GetRequestType() const {
   return URLFetcher::DELETE_REQUEST;
 }
 
 std::vector<std::string>
@@ skipping 269 matching lines @@
   return true;
 }
 
 void ResumeUploadOperation::OnURLFetchUploadProgress(
     const URLFetcher* source, int64 current, int64 total) {
   // Adjust the progress values according to the range currently uploaded.
   NotifyProgress(params_.start_position + current, params_.content_length);
 }
 
 }  // namespace google_apis