gdata cleanup: stop passing Profile* around GData operations.

chrome/browser/chromeos/gdata/gdata_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/chromeos/gdata/gdata_operations.h"
 
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
@@ skipping 137 matching lines @@
 }
 
 }  // namespace
 
 namespace gdata {
 
 //============================ GetDocumentsOperation ===========================
 
 GetDocumentsOperation::GetDocumentsOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     int start_changestamp,
     const std::string& search_string,
     const std::string& directory_resource_id,
     const GetDataCallback& callback)
-    : GetDataOperation(registry, profile, callback),
+    : GetDataOperation(registry, callback),
       start_changestamp_(start_changestamp),
       search_string_(search_string),
       directory_resource_id_(directory_resource_id) {
 }
 
 GetDocumentsOperation::~GetDocumentsOperation() {}
 
 void GetDocumentsOperation::SetUrl(const GURL& url) {
   override_url_ = url;
 }
@@ skipping 18 matching lines @@
   return AddFeedUrlParams(GURL(kGetChangesListURL),
                           kMaxDocumentsPerFeed,
                           start_changestamp_,
                           std::string());
 }
 
 //============================ GetDocumentEntryOperation =======================
 
 GetDocumentEntryOperation::GetDocumentEntryOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const std::string& resource_id,
     const GetDataCallback& callback)
-    : GetDataOperation(registry, profile, callback),
+    : GetDataOperation(registry, callback),
       resource_id_(resource_id) {
 }
 
 GetDocumentEntryOperation::~GetDocumentEntryOperation() {}
 
 GURL GetDocumentEntryOperation::GetURL() const {
   GURL result = GURL(base::StringPrintf(kGetDocumentEntryURLFormat,
                                         net::EscapePath(resource_id_).c_str()));
   return AddStandardUrlParams(result);
 }
 
 //========================= GetAccountMetadataOperation ========================
 
 GetAccountMetadataOperation::GetAccountMetadataOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const GetDataCallback& callback)
-    : GetDataOperation(registry, profile, callback) {
+    : GetDataOperation(registry, callback) {
 }
 
 GetAccountMetadataOperation::~GetAccountMetadataOperation() {}
 
 GURL GetAccountMetadataOperation::GetURL() const {
   return AddMetadataUrlParams(GURL(kAccountMetadataURL));
 }
 
 //============================ DownloadFileOperation ===========================
 
 DownloadFileOperation::DownloadFileOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const DownloadActionCallback& download_action_callback,
     const GetDownloadDataCallback& get_download_data_callback,
     const GURL& document_url,
     const FilePath& virtual_path,
     const FilePath& output_file_path)
     : UrlFetchOperationBase(registry,
                             GDataOperationRegistry::OPERATION_DOWNLOAD,
-                            virtual_path,
-                            profile),
+                            virtual_path),
       download_action_callback_(download_action_callback),
       get_download_data_callback_(get_download_data_callback),
       document_url_(document_url) {
   // Make sure we download the content into a temp file.
   if (output_file_path.empty())
     save_temp_file_ = true;
   else
     output_file_path_ = output_file_path;
 }
 
 DownloadFileOperation::~DownloadFileOperation() {}
 
 // Overridden from UrlFetchOperationBase.
 GURL DownloadFileOperation::GetURL() const {
   return document_url_;
 }
 
-void DownloadFileOperation::OnURLFetchDownloadProgress(
-    const URLFetcher* source,
-    int64 current,
-    int64 total) {
+void DownloadFileOperation::OnURLFetchDownloadProgress(const URLFetcher* source,
+                                                       int64 current,
+                                                       int64 total) {
   NotifyProgress(current, total);
 }
 
 bool DownloadFileOperation::ShouldSendDownloadData() {
   return !get_download_data_callback_.is_null();
 }
 
 void DownloadFileOperation::OnURLFetchDownloadData(
     const URLFetcher* source,
     scoped_ptr<std::string> download_data) {
@@ skipping 19 matching lines @@
 
 void DownloadFileOperation::RunCallbackOnPrematureFailure(GDataErrorCode code) {
   if (!download_action_callback_.is_null())
     download_action_callback_.Run(code, document_url_, FilePath());
 }
 
 //=========================== DeleteDocumentOperation ==========================
 
 DeleteDocumentOperation::DeleteDocumentOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const EntryActionCallback& callback,
     const GURL& document_url)
-    : EntryActionOperation(registry, profile, callback, document_url) {
+    : EntryActionOperation(registry, callback, document_url) {
 }
 
 DeleteDocumentOperation::~DeleteDocumentOperation() {}
 
 GURL DeleteDocumentOperation::GetURL() const {
   return 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);
   return headers;
 }
 
 //========================== CreateDirectoryOperation ==========================
 
 CreateDirectoryOperation::CreateDirectoryOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const GetDataCallback& callback,
     const GURL& parent_content_url,
     const FilePath::StringType& directory_name)
-    : GetDataOperation(registry, profile, callback),
+    : GetDataOperation(registry, callback),
       parent_content_url_(parent_content_url),
       directory_name_(directory_name) {
 }
 
 CreateDirectoryOperation::~CreateDirectoryOperation() {}
 
 GURL CreateDirectoryOperation::GetURL() const {
   if (!parent_content_url_.is_empty())
     return AddStandardUrlParams(parent_content_url_);
 
@@ skipping 27 matching lines @@
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "CreateDirectory data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //============================ CopyDocumentOperation ===========================
 
 CopyDocumentOperation::CopyDocumentOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const GetDataCallback& callback,
     const std::string& resource_id,
     const FilePath::StringType& new_name)
-    : GetDataOperation(registry, profile, callback),
+    : GetDataOperation(registry, callback),
       resource_id_(resource_id),
       new_name_(new_name) {
 }
 
 CopyDocumentOperation::~CopyDocumentOperation() {}
 
 URLFetcher::RequestType CopyDocumentOperation::GetRequestType() const {
   return URLFetcher::POST;
 }
 
@@ skipping 17 matching lines @@
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "CopyDocumentOperation data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== RenameResourceOperation ==========================
 
 RenameResourceOperation::RenameResourceOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const EntryActionCallback& callback,
     const GURL& document_url,
     const FilePath::StringType& new_name)
-    : EntryActionOperation(registry, profile, callback, document_url),
+    : EntryActionOperation(registry, callback, document_url),
       new_name_(new_name) {
 }
 
 RenameResourceOperation::~RenameResourceOperation() {}
 
 URLFetcher::RequestType RenameResourceOperation::GetRequestType() const {
   return URLFetcher::PUT;
 }
 
 std::vector<std::string>
@@ skipping 22 matching lines @@
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "RenameResourceOperation data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //=========================== AuthorizeAppOperation ==========================
 
 AuthorizeAppsOperation::AuthorizeAppsOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const GetDataCallback& callback,
     const GURL& document_url,
     const std::string& app_id)
-    : GetDataOperation(registry, profile, callback),
+    : GetDataOperation(registry, callback),
       app_id_(app_id),
       document_url_(document_url) {
 }
 
 AuthorizeAppsOperation::~AuthorizeAppsOperation() {}
 
 URLFetcher::RequestType AuthorizeAppsOperation::GetRequestType() const {
   return URLFetcher::PUT;
 }
 
@@ skipping 65 matching lines @@
 }
 
 GURL AuthorizeAppsOperation::GetURL() const {
   return document_url_;
 }
 
 //======================= AddResourceToDirectoryOperation ======================
 
 AddResourceToDirectoryOperation::AddResourceToDirectoryOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const EntryActionCallback& callback,
     const GURL& parent_content_url,
     const GURL& document_url)
-    : EntryActionOperation(registry, profile, callback, document_url),
+    : EntryActionOperation(registry, callback, document_url),
       parent_content_url_(parent_content_url) {
 }
 
 AddResourceToDirectoryOperation::~AddResourceToDirectoryOperation() {}
 
 GURL AddResourceToDirectoryOperation::GetURL() const {
   if (!parent_content_url_.is_empty())
     return AddStandardUrlParams(parent_content_url_);
 
   return AddStandardUrlParams(GURL(kDocumentListRootURL));
@@ skipping 19 matching lines @@
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "AddResourceToDirectoryOperation data: " << *upload_content_type
            << ", [" << *upload_content << "]";
   return true;
 }
 
 //==================== RemoveResourceFromDirectoryOperation ====================
 
 RemoveResourceFromDirectoryOperation::RemoveResourceFromDirectoryOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const EntryActionCallback& callback,
     const GURL& parent_content_url,
     const GURL& document_url,
     const std::string& document_resource_id)
-    : EntryActionOperation(registry, profile, callback, document_url),
+    : EntryActionOperation(registry, callback, document_url),
       resource_id_(document_resource_id),
       parent_content_url_(parent_content_url) {
 }
 
 RemoveResourceFromDirectoryOperation::~RemoveResourceFromDirectoryOperation() {
 }
 
 GURL RemoveResourceFromDirectoryOperation::GetURL() const {
   std::string escaped_resource_id = net::EscapePath(resource_id_);
   GURL edit_url(base::StringPrintf("%s/%s",
@@ skipping 11 matching lines @@
 RemoveResourceFromDirectoryOperation::GetExtraRequestHeaders() const {
   std::vector<std::string> headers;
   headers.push_back(kIfMatchAllHeader);
   return headers;
 }
 
 //=========================== InitiateUploadOperation ==========================
 
 InitiateUploadOperation::InitiateUploadOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const InitiateUploadCallback& callback,
     const InitiateUploadParams& params)
     : UrlFetchOperationBase(registry,
                             GDataOperationRegistry::OPERATION_UPLOAD,
-                            params.virtual_path,
-                            profile),
+                            params.virtual_path),
       callback_(callback),
       params_(params),
       initiate_upload_url_(chrome_common_net::AppendOrReplaceQueryParameter(
           params.upload_location,
           kUploadParamConvertKey,
           kUploadParamConvertValue)) {
 }
 
 InitiateUploadOperation::~InitiateUploadOperation() {}
 
@@ skipping 80 matching lines @@
   upload_content->assign(xml_writer.GetWrittenString());
   DVLOG(1) << "Upload data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
 //============================ ResumeUploadOperation ===========================
 
 ResumeUploadOperation::ResumeUploadOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const ResumeUploadCallback& callback,
     const ResumeUploadParams& params)
   : UrlFetchOperationBase(registry,
                           GDataOperationRegistry::OPERATION_UPLOAD,
-                          params.virtual_path,
-                          profile),
+                          params.virtual_path),
       callback_(callback),
       params_(params),
       last_chunk_completed_(false) {
 }
 
 ResumeUploadOperation::~ResumeUploadOperation() {}
 
 GURL ResumeUploadOperation::GetURL() const {
   return params_.upload_location;
 }
@@ skipping 121 matching lines @@
 
 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);
 }
 
 //============================ GetContactsOperation ============================
 
 GetContactsOperation::GetContactsOperation(GDataOperationRegistry* registry,
-                                           Profile* profile,
                                            const base::Time& min_update_time,
                                            const GetDataCallback& callback)
-    : GetDataOperation(registry, profile, callback),
+    : GetDataOperation(registry, callback),
       min_update_time_(min_update_time) {
 }
 
 GetContactsOperation::~GetContactsOperation() {}
 
 GURL GetContactsOperation::GetURL() const {
   if (!feed_url_for_testing_.is_empty())
     return GURL(feed_url_for_testing_);
 
   GURL url(kGetContactsURL);
   if (!min_update_time_.is_null()) {
     std::string time_rfc3339 = util::FormatTimeAsString(min_update_time_);
     url = chrome_common_net::AppendQueryParameter(
               url, kGetContactsUpdatedMinParam, time_rfc3339);
   }
   return url;
 }
 
 //========================== GetContactPhotoOperation ==========================
 
 GetContactPhotoOperation::GetContactPhotoOperation(
     GDataOperationRegistry* registry,
-    Profile* profile,
     const GURL& photo_url,
     const GetDownloadDataCallback& callback)
-    : UrlFetchOperationBase(registry, profile),
+    : UrlFetchOperationBase(registry),
       photo_url_(photo_url),
       callback_(callback) {
 }
 
 GetContactPhotoOperation::~GetContactPhotoOperation() {}
 
 GURL GetContactPhotoOperation::GetURL() const {
   return photo_url_;
 }
 
 void GetContactPhotoOperation::ProcessURLFetchResults(
     const net::URLFetcher* source) {
   GDataErrorCode code = static_cast<GDataErrorCode>(source->GetResponseCode());
   scoped_ptr<std::string> data(new std::string);
   source->GetResponseAsString(data.get());
   callback_.Run(code, data.Pass());
   OnProcessURLFetchResultsComplete(code == HTTP_SUCCESS);
 }
 
 void GetContactPhotoOperation::RunCallbackOnPrematureFailure(
     GDataErrorCode code) {
   scoped_ptr<std::string> data(new std::string);
   callback_.Run(code, data.Pass());
 }
 
 }  // namespace gdata