google_apis: Remove document_url_ from EntryActionOperation

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 212 matching lines @@
   if (!download_action_callback_.is_null())
     download_action_callback_.Run(code, FilePath());
 }
 
 //=========================== DeleteDocumentOperation ==========================
 
 DeleteDocumentOperation::DeleteDocumentOperation(
     OperationRegistry* registry,
     const EntryActionCallback& callback,
     const GURL& document_url)
-    : EntryActionOperation(registry, callback, document_url) {
+    : EntryActionOperation(registry, callback),
+      document_url_(document_url) {
 }
 
 DeleteDocumentOperation::~DeleteDocumentOperation() {}
 
 GURL DeleteDocumentOperation::GetURL() const {
-  return GDataWapiUrlGenerator::AddStandardUrlParams(document_url());
+  return GDataWapiUrlGenerator::AddStandardUrlParams(document_url_);
 }
 
 URLFetcher::RequestType DeleteDocumentOperation::GetRequestType() const {
   return URLFetcher::DELETE_REQUEST;
 }
 
 std::vector<std::string>
 DeleteDocumentOperation::GetExtraRequestHeaders() const {
   std::vector<std::string> headers;
   headers.push_back(kIfMatchAllHeader);
@@ skipping 96 matching lines @@
   return true;
 }
 
 //=========================== RenameResourceOperation ==========================
 
 RenameResourceOperation::RenameResourceOperation(
     OperationRegistry* registry,
     const EntryActionCallback& callback,
     const GURL& document_url,
     const FilePath::StringType& new_name)
-    : EntryActionOperation(registry, callback, document_url),
+    : EntryActionOperation(registry, callback),
+      document_url_(document_url),
       new_name_(new_name) {
 }
 
 RenameResourceOperation::~RenameResourceOperation() {}
 
 URLFetcher::RequestType RenameResourceOperation::GetRequestType() const {
   return URLFetcher::PUT;
 }
 
 std::vector<std::string>
 RenameResourceOperation::GetExtraRequestHeaders() const {
   std::vector<std::string> headers;
   headers.push_back(kIfMatchAllHeader);
   return headers;
 }
 
 GURL RenameResourceOperation::GetURL() const {
-  return GDataWapiUrlGenerator::AddStandardUrlParams(document_url());
+  return GDataWapiUrlGenerator::AddStandardUrlParams(document_url_);
 }
 
 bool RenameResourceOperation::GetContentData(std::string* upload_content_type,
                                              std::string* upload_content) {
   upload_content_type->assign("application/atom+xml");
   XmlWriter xml_writer;
   xml_writer.StartWriting();
   xml_writer.StartElement("entry");
   xml_writer.AddAttribute("xmlns", "http://www.w3.org/2005/Atom");
 
@@ skipping 106 matching lines @@
 }
 
 //======================= AddResourceToDirectoryOperation ======================
 
 AddResourceToDirectoryOperation::AddResourceToDirectoryOperation(
     OperationRegistry* registry,
     const GDataWapiUrlGenerator& url_generator,
     const EntryActionCallback& callback,
     const GURL& parent_content_url,
     const GURL& document_url)
-    : EntryActionOperation(registry, callback, document_url),
+    : EntryActionOperation(registry, callback),
       url_generator_(url_generator),
-      parent_content_url_(parent_content_url) {
+      parent_content_url_(parent_content_url),
+      document_url_(document_url) {
 }
 
 AddResourceToDirectoryOperation::~AddResourceToDirectoryOperation() {}
 
 GURL AddResourceToDirectoryOperation::GetURL() const {
   if (!parent_content_url_.is_empty())
     return GDataWapiUrlGenerator::AddStandardUrlParams(parent_content_url_);
 
   return url_generator_.GenerateDocumentListRootUrl();
 }
 
 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");
   XmlWriter xml_writer;
   xml_writer.StartWriting();
   xml_writer.StartElement("entry");
   xml_writer.AddAttribute("xmlns", "http://www.w3.org/2005/Atom");
 
-  xml_writer.WriteElement("id", document_url().spec());
+  xml_writer.WriteElement("id", document_url_.spec());
 
   xml_writer.EndElement();  // Ends "entry" element.
   xml_writer.StopWriting();
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "AddResourceToDirectoryOperation data: " << *upload_content_type
            << ", [" << *upload_content << "]";
   return true;
 }
 
 //==================== RemoveResourceFromDirectoryOperation ====================
 
 RemoveResourceFromDirectoryOperation::RemoveResourceFromDirectoryOperation(
     OperationRegistry* registry,
     const EntryActionCallback& callback,
     const GURL& parent_content_url,
     const GURL& document_url,
     const std::string& document_resource_id)
-    : EntryActionOperation(registry, callback, document_url),
+    : EntryActionOperation(registry, callback),
       resource_id_(document_resource_id),
-      parent_content_url_(parent_content_url) {
+      parent_content_url_(parent_content_url),
+      document_url_(document_url) {
 }
 
 RemoveResourceFromDirectoryOperation::~RemoveResourceFromDirectoryOperation() {
 }
 
 GURL RemoveResourceFromDirectoryOperation::GetURL() const {
   std::string escaped_resource_id = net::EscapePath(resource_id_);
   GURL edit_url(base::StringPrintf("%s/%s",
                                    parent_content_url_.spec().c_str(),
                                    escaped_resource_id.c_str()));
@@ skipping 258 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_range + current, params_.content_length);
 }
 
 }  // namespace google_apis