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

chrome/browser/chromeos/contacts/google_contact_store.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/google_contact_store.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
@@ skipping 32 matching lines @@
 // daylight saving time shenanigans or minor skew in the system clock.
 const int kForceFullUpdateDays = 29;
 
 // When an update fails, we initially wait this many seconds before retrying.
 // The delay increases exponentially in response to repeated failures.
 const int kUpdateFailureInitialRetrySec = 5;
 
 // Amount by which |update_delay_on_next_failure_| is multiplied on failure.
 const int kUpdateFailureBackoffFactor = 2;
 
+// OAuth2 scope for the Contacts API.
+const char kContactsScope[] = "https://www.google.com/m8/feeds/";
+
 }  // namespace
 
 GoogleContactStore::TestAPI::TestAPI(GoogleContactStore* store)
     : store_(store) {
   DCHECK(store);
 }
 
 GoogleContactStore::TestAPI::~TestAPI() {
   store_ = NULL;
 }
@@ skipping 50 matching lines @@
   weak_ptr_factory_.InvalidateWeakPtrs();
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
   DestroyDatabase();
 }
 
 void GoogleContactStore::Init() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Create a GData service if one hasn't already been assigned for testing.
   if (!gdata_service_.get()) {
+    std::vector<std::string> scopes;
+    scopes.push_back(kContactsScope);
+
     gdata_service_.reset(new GDataContactsService(
-        url_request_context_getter_, profile_));
-    gdata_service_->Initialize();
+        url_request_context_getter_,
+        new google_apis::AuthService(
+            profile_, url_request_context_getter_, scopes)));
   }
 
   base::FilePath db_path = profile_->GetPath().Append(kDatabaseDirectoryName);
   VLOG(1) << "Initializing contact database \"" << db_path.value() << "\" for "
           << profile_->GetProfileName();
   db_->Init(db_path,
             base::Bind(&GoogleContactStore::OnDatabaseInitialized,
                        weak_ptr_factory_.GetWeakPtr()));
 }
 
@@ skipping 271 matching lines @@
 }
 
 ContactStore* GoogleContactStoreFactory::CreateContactStore(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(CanCreateContactStoreForProfile(profile));
   return new GoogleContactStore(
       g_browser_process->system_request_context(), profile);
 }
 
 }  // namespace contacts