gdata cleanup: stop passing Profile* around GData operations.

chrome/browser/chromeos/gdata/gdata_contacts_service.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_contacts_service.h"
 
 #include <cstring>
 #include <string>
 #include <map>
 #include <utility>
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/gdata/gdata_operation_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_operation_runner.h"
 #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;
 
 namespace gdata {
 
 namespace {
 
 // Maximum number of profile photos that we'll download at once.
 const int kMaxSimultaneousPhotoDownloads = 10;
@@ skipping 276 matching lines @@
 //
 // First, the contacts feed is downloaded via GetContactsOperation and parsed.
 // Individual contacts::Contact objects are created using the data from the
 // feed.  Next, GetContactPhotoOperations are created and used to start
 // downloading contacts' photos in parallel.  When all photos have been
 // downloaded, the contacts are passed to the passed-in callback.
 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),
         min_update_time_(min_update_time),
         contacts_(new ScopedVector<contacts::Contact>),
         max_simultaneous_photo_downloads_(max_simultaneous_photo_downloads),
         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;
   }
 
   // Issues the initial request to download the contact feed.
   void Run() {
     GetContactsOperation* operation =
         new GetContactsOperation(
             runner_->operation_registry(),
-            profile_,
             min_update_time_,
             base::Bind(&DownloadContactsRequest::HandleFeedData,
                        base::Unretained(this)));
     if (!service_->feed_url_for_testing_.is_empty())
       operation->set_feed_url_for_testing(service_->feed_url_for_testing_);
 
     runner_->StartOperationWithRetry(operation);
   }
 
  private:
@@ skipping 123 matching lines @@
       contacts::Contact* contact = contacts_needing_photo_downloads_.back();
       contacts_needing_photo_downloads_.pop_back();
       DCHECK(contact_photo_urls_.count(contact));
       std::string url = contact_photo_urls_[contact];
 
       VLOG(1) << "Starting download of photo " << url << " for "
               << contact->provider_id();
       runner_->StartOperationWithRetry(
           new GetContactPhotoOperation(
               runner_->operation_registry(),
-              profile_,
               GURL(url),
               base::Bind(&DownloadContactsRequest::HandlePhotoData,
                          AsWeakPtr(), contact)));
       num_in_progress_photo_downloads_++;
     }
   }
 
   // Callback for GetContactPhotoOperation calls.  Updates the associated
   // Contact and checks for completion.
   void HandlePhotoData(contacts::Contact* contact,
@@ skipping 16 matching lines @@
     }
 
     contact->set_raw_untrusted_photo(*download_data);
     CheckCompletion();
   }
 
  private:
   typedef std::map<contacts::Contact*, std::string> ContactPhotoUrls;
 
   GDataContactsService* service_;  // not owned
-  Profile* profile_;  // not owned
   GDataOperationRunner* runner_;  // not owned
 
   SuccessCallback success_callback_;
   FailureCallback failure_callback_;
 
   base::Time min_update_time_;
 
   scoped_ptr<ScopedVector<contacts::Contact> > contacts_;
 
   // Map from a contact to the URL at which its photo is located.
@@ skipping 10 matching lines @@
   // Number of in-progress photo downloads.
   int num_in_progress_photo_downloads_;
 
   // Did we encounter a fatal error while downloading a photo?
   bool photo_download_failed_;
 
   DISALLOW_COPY_AND_ASSIGN(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() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->CancelAll();
   STLDeleteContainerPointers(requests_.begin(), requests_.end());
   requests_.clear();
 }
 
 GDataAuthService* GDataContactsService::auth_service_for_testing() {
   return runner_->auth_service();
 }
 
 void GDataContactsService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   runner_->Initialize();
 }
 
 void GDataContactsService::DownloadContacts(SuccessCallback success_callback,
                                             FailureCallback failure_callback,
                                             const base::Time& min_update_time) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadContactsRequest* request =
       new DownloadContactsRequest(this,
-                                  profile_,
                                   runner_.get(),
                                   success_callback,
                                   failure_callback,
                                   min_update_time,
                                   max_simultaneous_photo_downloads_);
   VLOG(1) << "Starting contacts download with request " << request;
   requests_.insert(request);
   request->Run();
 }
 
 void GDataContactsService::OnRequestComplete(DownloadContactsRequest* request) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(request);
   VLOG(1) << "Download request " << request << " complete";
   requests_.erase(request);
   delete request;
 }
 
 }  // namespace contacts