Change google_api::RequestSender to take an AuthService instead of a Profile.

chrome/browser/chromeos/contacts/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/contacts/gdata_contacts_service.h"
 
 #include <cstring>
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 128 matching lines @@
 const char kAddressRelMobileValue[] = "http://schemas.google.com/g/2005#mobile";
 const char kAddressLabelField[] = "label";
 
 // Fields in entries in the |kLinkField| list.
 const char kLinkHrefField[] = "href";
 const char kLinkRelField[] = "rel";
 const char kLinkETagField[] = "gd$etag";
 const char kLinkRelPhotoValue[] =
     "http://schemas.google.com/contacts/2008/rel#photo";
 
-// OAuth2 scope for the Contacts API.
-const char kContactsScope[] = "https://www.google.com/m8/feeds/";
-
 // Returns a string containing a pretty-printed JSON representation of |value|.
 std::string PrettyPrintValue(const base::Value& value) {
   std::string out;
   base::JSONWriter::WriteWithOptions(
       &value, base::JSONWriter::OPTIONS_PRETTY_PRINT, &out);
   return out;
 }
 
 // Assigns the value at |path| within |dict| to |out|, returning false if the
 // path wasn't present.  Unicode byte order marks are removed from the string.
@@ skipping 682 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<DownloadContactsRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadContactsRequest);
 };
 
 GDataContactsService::GDataContactsService(
     net::URLRequestContextGetter* url_request_context_getter,
-    Profile* profile)
+    google_apis::AuthServiceInterface* auth_service)
     : max_photo_downloads_per_second_(kMaxPhotoDownloadsPerSecond),
       photo_download_timer_interval_(base::TimeDelta::FromSeconds(1)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  std::vector<std::string> scopes;
-  scopes.push_back(kContactsScope);
   sender_.reset(new google_apis::RequestSender(
-      profile,
+      auth_service,
       url_request_context_getter,
       content::BrowserThread::GetBlockingPool(),
-      scopes,
       "" /* custom_user_agent */));
 }
 
 GDataContactsService::~GDataContactsService() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   STLDeleteContainerPointers(requests_.begin(), requests_.end());
   requests_.clear();
 }
 
-google_apis::AuthService* GDataContactsService::auth_service_for_testing() {
-  return sender_->auth_service();
-}
-
-void GDataContactsService::Initialize() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  sender_->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,
                                   sender_.get(),
                                   success_callback,
                                   failure_callback,
                                   min_update_time);
   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";
   if (!request->my_contacts_group_id().empty())
     cached_my_contacts_group_id_ = request->my_contacts_group_id();
   requests_.erase(request);
   delete request;
 }
 
 }  // namespace contacts