Replace parent_content_url in DriveServiceInterface with parent_resource_id.

The GData WAPI has a concept "content URL" to manipulate (e.g. creating a
directory) a resource, while Drive API uses resource id.
To fill the gap, this CL replaces the content url for parent directory
in DriveServiceInterface with resource id, and generates needed content urls
inside the GDataWapiUrlGenerator.

BUG=148629, 148628
TEST=Ran unit_tests.


Review URL: https://chromiumcodereview.appspot.com/11896012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178858 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 7 deletions

diff --git a/chrome/browser/google_apis/gdata_wapi_operations.h b/chrome/browser/google_apis/gdata_wapi_operations.h
index 13e2c2d..f4708c8 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations.h
+++ b/chrome/browser/google_apis/gdata_wapi_operations.h
@@ -219,7 +219,7 @@ class DeleteResourceOperation : public EntryActionOperation {
 class CreateDirectoryOperation : public GetDataOperation {
  public:
   // A new directory will be created under a directory specified by
-  // |parent_content_url|. If this parameter is empty, a new directory will
+  // |parent_resource_id|. If this parameter is empty, a new directory will
   // be created in the root directory.
   // |callback| must not be null.
   CreateDirectoryOperation(
@@ -227,7 +227,7 @@ class CreateDirectoryOperation : public GetDataOperation {
       net::URLRequestContextGetter* url_request_context_getter,
       const GDataWapiUrlGenerator& url_generator,
       const GetDataCallback& callback,
-      const GURL& parent_content_url,
+      const std::string& parent_resource_id,
       const std::string& directory_name);
   virtual ~CreateDirectoryOperation();
 
@@ -240,7 +240,7 @@ class CreateDirectoryOperation : public GetDataOperation {
 
  private:
   const GDataWapiUrlGenerator url_generator_;
-  const GURL parent_content_url_;
+  const std::string parent_resource_id_;
   const std::string directory_name_;
 
   DISALLOW_COPY_AND_ASSIGN(CreateDirectoryOperation);
@@ -349,7 +349,7 @@ class AddResourceToDirectoryOperation : public EntryActionOperation {
       net::URLRequestContextGetter* url_request_context_getter,
       const GDataWapiUrlGenerator& url_generator,
       const EntryActionCallback& callback,
-      const GURL& parent_content_url,
+      const std::string& parent_resource_id,
       const GURL& edit_url);
   virtual ~AddResourceToDirectoryOperation();
 
@@ -362,7 +362,7 @@ class AddResourceToDirectoryOperation : public EntryActionOperation {
 
  private:
   const GDataWapiUrlGenerator url_generator_;
-  const GURL parent_content_url_;
+  const std::string parent_resource_id_;
   const GURL edit_url_;
 
   DISALLOW_COPY_AND_ASSIGN(AddResourceToDirectoryOperation);
@@ -380,7 +380,7 @@ class RemoveResourceFromDirectoryOperation : public EntryActionOperation {
       net::URLRequestContextGetter* url_request_context_getter,
       const GDataWapiUrlGenerator& url_generator,
       const EntryActionCallback& callback,
-      const GURL& parent_content_url,
+      const std::string& parent_resource_id,
       const std::string& resource_id);
   virtual ~RemoveResourceFromDirectoryOperation();
 
@@ -393,7 +393,7 @@ class RemoveResourceFromDirectoryOperation : public EntryActionOperation {
  private:
   const GDataWapiUrlGenerator url_generator_;
   const std::string resource_id_;
-  const GURL parent_content_url_;
+  const std::string parent_resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoveResourceFromDirectoryOperation);
 };