gdata cleanup: stop passing Profile* around GData operations.

After http://crosbug.com/29043 is resolved, Profile* is not used
in GData operations, except that GDataAuthService::Initialize (and
hence indirectly GDataOperationRunner) does indeed refers
to profile for OAuth2 refresh token.

BUG=none
TEST=existing tests (there should be no behavior change)

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

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

chrome/browser/chromeos/gdata/drive_api_operations.cc

@@ -16,11 +16,9 @@ namespace gdata {
 
 //============================== GetAboutOperation =============================
 
-GetAboutOperation::GetAboutOperation(
-    GDataOperationRegistry* registry,
-    Profile* profile,
-    const GetDataCallback& callback)
-    : GetDataOperation(registry, profile, callback) {}
+GetAboutOperation::GetAboutOperation(GDataOperationRegistry* registry,
+                                     const GetDataCallback& callback)
+    : GetDataOperation(registry, callback) {}
 
 GetAboutOperation::~GetAboutOperation() {}
 
@@ -30,11 +28,9 @@ GURL GetAboutOperation::GetURL() const {
 
 //============================== GetApplistOperation ===========================
 
-GetApplistOperation::GetApplistOperation(
-    GDataOperationRegistry* registry,
-    Profile* profile,
-    const GetDataCallback& callback)
-    : GetDataOperation(registry, profile, callback) {}
+GetApplistOperation::GetApplistOperation(GDataOperationRegistry* registry,
+                                         const GetDataCallback& callback)
+    : GetDataOperation(registry, callback) {}
 
 GetApplistOperation::~GetApplistOperation() {}
 

chrome/browser/chromeos/gdata/drive_api_operations.h

@@ -19,7 +19,6 @@ namespace gdata {
 class GetAboutOperation : public GetDataOperation {
  public:
   GetAboutOperation(GDataOperationRegistry* registry,
-                    Profile* profile,
                     const GetDataCallback& callback);
   virtual ~GetAboutOperation();
 
@@ -37,7 +36,6 @@ class GetAboutOperation : public GetDataOperation {
 class GetApplistOperation : public GetDataOperation {
  public:
   GetApplistOperation(GDataOperationRegistry* registry,
-                      Profile* profile,
                       const GetDataCallback& callback);
   virtual ~GetApplistOperation();
 

chrome/browser/chromeos/gdata/gdata_auth_service.cc

@@ -81,8 +81,7 @@ void GDataAuthService::StartAuthenticationOnUIThread(
     const AuthStatusCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   // We have refresh token, let's gets authenticated.
-  (new AuthOperation(registry, profile_,
-                     callback, refresh_token_))->Start();
+  (new AuthOperation(registry, callback, refresh_token_))->Start();
 }
 
 void GDataAuthService::OnAuthCompleted(

chrome/browser/chromeos/gdata/gdata_contacts_service.cc

@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/gdata/gdata_operations.h"
 #include "chrome/browser/chromeos/gdata/gdata_params.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 
 using content::BrowserThread;
@@ -317,14 +316,12 @@ class GDataContactsService::DownloadContactsRequest
     : public base::SupportsWeakPtr<DownloadContactsRequest> {
  public:
   DownloadContactsRequest(GDataContactsService* service,
-                          Profile* profile,
                           GDataOperationRunner* runner,
                           SuccessCallback success_callback,
                           FailureCallback failure_callback,
                           const base::Time& min_update_time,
                           int max_simultaneous_photo_downloads)
       : service_(service),
-        profile_(profile),
         runner_(runner),
         success_callback_(success_callback),
         failure_callback_(failure_callback),
@@ -334,14 +331,12 @@ class GDataContactsService::DownloadContactsRequest
         num_in_progress_photo_downloads_(0),
         photo_download_failed_(false) {
     DCHECK(service_);
-    DCHECK(profile_);
     DCHECK(runner_);
   }
 
   ~DownloadContactsRequest() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     service_ = NULL;
-    profile_ = NULL;
     runner_ = NULL;
   }
 
@@ -350,7 +345,6 @@ class GDataContactsService::DownloadContactsRequest
     GetContactsOperation* operation =
         new GetContactsOperation(
             runner_->operation_registry(),
-            profile_,
             min_update_time_,
             base::Bind(&DownloadContactsRequest::HandleFeedData,
                        base::Unretained(this)));
@@ -494,7 +488,6 @@ class GDataContactsService::DownloadContactsRequest
       runner_->StartOperationWithRetry(
           new GetContactPhotoOperation(
               runner_->operation_registry(),
-              profile_,
               GURL(url),
               base::Bind(&DownloadContactsRequest::HandlePhotoData,
                          AsWeakPtr(), contact)));
@@ -531,7 +524,6 @@ class GDataContactsService::DownloadContactsRequest
   typedef std::map<contacts::Contact*, std::string> ContactPhotoUrls;
 
   GDataContactsService* service_;  // not owned
-  Profile* profile_;  // not owned
   GDataOperationRunner* runner_;  // not owned
 
   SuccessCallback success_callback_;
@@ -562,11 +554,9 @@ class GDataContactsService::DownloadContactsRequest
 };
 
 GDataContactsService::GDataContactsService(Profile* profile)
-    : profile_(profile),
-      runner_(new GDataOperationRunner(profile)),
+    : runner_(new GDataOperationRunner(profile)),
       max_simultaneous_photo_downloads_(kMaxSimultaneousPhotoDownloads) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(profile_);
 }
 
 GDataContactsService::~GDataContactsService() {
@@ -591,7 +581,6 @@ void GDataContactsService::DownloadContacts(SuccessCallback success_callback,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadContactsRequest* request =
       new DownloadContactsRequest(this,
-                                  profile_,
                                   runner_.get(),
                                   success_callback,
                                   failure_callback,

chrome/browser/chromeos/gdata/gdata_documents_service.cc

@@ -103,7 +103,6 @@ void DocumentsService::GetDocuments(const GURL& url,
 
   GetDocumentsOperation* operation =
       new GetDocumentsOperation(operation_registry(),
-                                profile_,
                                 start_changestamp,
                                 search_query,
                                 directory_resource_id,
@@ -119,7 +118,6 @@ void DocumentsService::GetDocumentEntry(const std::string& resource_id,
 
   GetDocumentEntryOperation* operation =
       new GetDocumentEntryOperation(operation_registry(),
-                                    profile_,
                                     resource_id,
                                     callback);
   runner_->StartOperationWithRetry(operation);
@@ -129,25 +127,23 @@ void DocumentsService::GetAccountMetadata(const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetAccountMetadataOperation* operation =
-      new GetAccountMetadataOperation(operation_registry(),
-                                      profile_,
-                                      callback);
+      new GetAccountMetadataOperation(operation_registry(), callback);
   runner_->StartOperationWithRetry(operation);
 }
 
 void DocumentsService::GetAboutResource(const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetAboutOperation* operation =
-      new GetAboutOperation(operation_registry(), profile_, callback);
+      new GetAboutOperation(operation_registry(), callback);
   runner_->StartOperationWithRetry(operation);
 }
 
 void DocumentsService::GetApplicationList(const GetDataCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   GetApplistOperation* operation =
-      new GetApplistOperation(operation_registry(), profile_, callback);
+      new GetApplistOperation(operation_registry(), callback);
   runner_->StartOperationWithRetry(operation);
 }
 
@@ -178,7 +174,7 @@ void DocumentsService::DownloadFile(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new DownloadFileOperation(operation_registry(), profile_,
+      new DownloadFileOperation(operation_registry(),
                                 download_action_callback,
                                 get_download_data_callback, document_url,
                                 virtual_path, local_cache_path));
@@ -189,7 +185,7 @@ void DocumentsService::DeleteDocument(const GURL& document_url,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new DeleteDocumentOperation(operation_registry(), profile_, callback,
+      new DeleteDocumentOperation(operation_registry(), callback,
                                   document_url));
 }
 
@@ -200,7 +196,7 @@ void DocumentsService::CreateDirectory(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new CreateDirectoryOperation(operation_registry(), profile_, callback,
+      new CreateDirectoryOperation(operation_registry(), callback,
                                    parent_content_url, directory_name));
 }
 
@@ -210,7 +206,7 @@ void DocumentsService::CopyDocument(const std::string& resource_id,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new CopyDocumentOperation(operation_registry(), profile_, callback,
+      new CopyDocumentOperation(operation_registry(), callback,
                                 resource_id, new_name));
 }
 
@@ -220,7 +216,7 @@ void DocumentsService::RenameResource(const GURL& resource_url,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new RenameResourceOperation(operation_registry(), profile_, callback,
+      new RenameResourceOperation(operation_registry(), callback,
                                   resource_url, new_name));
 }
 
@@ -232,7 +228,6 @@ void DocumentsService::AddResourceToDirectory(
 
   runner_->StartOperationWithRetry(
       new AddResourceToDirectoryOperation(operation_registry(),
-                                          profile_,
                                           callback,
                                           parent_content_url,
                                           resource_url));
@@ -247,7 +242,6 @@ void DocumentsService::RemoveResourceFromDirectory(
 
   runner_->StartOperationWithRetry(
       new RemoveResourceFromDirectoryOperation(operation_registry(),
-                                               profile_,
                                                callback,
                                                parent_content_url,
                                                resource_url,
@@ -265,17 +259,15 @@ void DocumentsService::InitiateUpload(const InitiateUploadParams& params,
   }
 
   runner_->StartOperationWithRetry(
-      new InitiateUploadOperation(operation_registry(), profile_, callback,
-                                  params));
+      new InitiateUploadOperation(operation_registry(), callback, params));
 }
 
 void DocumentsService::ResumeUpload(const ResumeUploadParams& params,
                                     const ResumeUploadCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new ResumeUploadOperation(operation_registry(), profile_, callback,
-                                params));
+      new ResumeUploadOperation(operation_registry(), callback, params));
 }
 
 
@@ -285,7 +277,7 @@ void DocumentsService::AuthorizeApp(const GURL& resource_url,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   runner_->StartOperationWithRetry(
-      new AuthorizeAppsOperation(operation_registry(), profile_, callback,
+      new AuthorizeAppsOperation(operation_registry(), callback,
                                  resource_url, app_ids));
 }