contacts: Make GoogleContactStore own GDataContactsService.

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/file_path.h"
 #include "base/logging.h"
 #include "chrome/browser/chromeos/contacts/contact.pb.h"
 #include "chrome/browser/chromeos/contacts/contact_database.h"
 #include "chrome/browser/chromeos/contacts/contact_store_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_contacts_service.h"
-#include "chrome/browser/chromeos/gdata/gdata_system_service.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 contacts {
 
 namespace {
 
@@ skipping 33 matching lines @@
   store_ = NULL;
 }
 
 void GoogleContactStore::TestAPI::SetDatabase(ContactDatabaseInterface* db) {
   store_->DestroyDatabase();
   store_->db_ = db;
 }
 
 void GoogleContactStore::TestAPI::SetGDataService(
     gdata::GDataContactsServiceInterface* service) {
-  store_->gdata_service_for_testing_.reset(service);
+  store_->gdata_service_.reset(service);
 }
 
 void GoogleContactStore::TestAPI::DoUpdate() {
   store_->UpdateContacts();
 }
 
 void GoogleContactStore::TestAPI::NotifyAboutNetworkStateChange(bool online) {
   net::NetworkChangeNotifier::ConnectionType type =
       online ?
       net::NetworkChangeNotifier::CONNECTION_UNKNOWN :
@@ skipping 17 matching lines @@
 
 GoogleContactStore::~GoogleContactStore() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   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()) {
+    gdata_service_.reset(new gdata::GDataContactsService(profile_));
+    gdata_service_->Initialize();
+  }
+
   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()));
 }
 
 void GoogleContactStore::AppendContacts(ContactPointers* contacts_out) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 77 matching lines @@
         last_contact_update_time_ + base::TimeDelta::FromMilliseconds(1);
   }
   if (min_update_time.is_null()) {
     VLOG(1) << "Downloading all contacts for " << profile_->GetProfileName();
   } else {
     VLOG(1) << "Downloading contacts updated since "
             << gdata::util::FormatTimeAsString(min_update_time) << " for "
             << profile_->GetProfileName();
   }
 
-  gdata::GDataContactsServiceInterface* service =
-      gdata_service_for_testing_.get() ?
-      gdata_service_for_testing_.get() :
-      gdata::GDataSystemServiceFactory::GetForProfile(profile_)->
-          contacts_service();
-  DCHECK(service);
-  service->DownloadContacts(
+  gdata_service_->DownloadContacts(
       base::Bind(&GoogleContactStore::OnDownloadSuccess,
                  weak_ptr_factory_.GetWeakPtr(),
                  min_update_time.is_null(),
                  GetCurrentTime()),
       base::Bind(&GoogleContactStore::OnDownloadFailure,
                  weak_ptr_factory_.GetWeakPtr()),
       min_update_time);
 }
 
 void GoogleContactStore::ScheduleUpdate(bool last_update_was_successful) {
@@ skipping 178 matching lines @@
   return gdata::util::IsGDataAvailable(profile);
 }
 
 ContactStore* GoogleContactStoreFactory::CreateContactStore(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(CanCreateContactStoreForProfile(profile));
   return new GoogleContactStore(profile);
 }
 
 }  // namespace contacts