contacts: Make GoogleContactStore own GDataContactsService.

chrome/browser/chromeos/contacts/google_contact_store.h

Index: chrome/browser/chromeos/contacts/google_contact_store.h
diff --git a/chrome/browser/chromeos/contacts/google_contact_store.h b/chrome/browser/chromeos/contacts/google_contact_store.h
index b8f2f41bb6e925bc7bbed9622ecdfb7ce6e8c9bd..27ca0886c154e194a036ea27ec0a37dc92eee77f 100644
--- a/chrome/browser/chromeos/contacts/google_contact_store.h
+++ b/chrome/browser/chromeos/contacts/google_contact_store.h
@@ -53,7 +53,8 @@ class GoogleContactStore
     // Takes ownership of |db|. Must be called before Init().
     void SetDatabase(ContactDatabaseInterface* db);
 
-    // Takes ownership of |service|. Must be called before Init().
+    // Takes ownership of |service|. Must be called before Init(). The caller is
+    // responsible for calling |service|'s Initialize() method.
     void SetGDataService(gdata::GDataContactsServiceInterface* service);
 
     // Triggers an update, similar to what happens when the update timer fires.
@@ -143,12 +144,12 @@ class GoogleContactStore
   // by Google).
   base::Time last_contact_update_time_;
 
+  // Used to download contacts.
+  scoped_ptr<gdata::GDataContactsServiceInterface> gdata_service_;

[kochi, 2012/08/24 01:40:51]

Maybe contacts_service_ a better name?

[Daniel Erat, 2012/08/24 16:52:30]

I think I still prefer leaving gdata in the name -- everything here is
contacts-related, so "contacts service" actually isn't very descriptive.

+
   // Used to save contacts to disk and load them at startup. Owns the object.
   ContactDatabaseInterface* db_;
 
-  // If non-NULL, used in place of the real GData service to download contacts.
-  scoped_ptr<gdata::GDataContactsServiceInterface> gdata_service_for_testing_;
-
   // Used to schedule calls to UpdateContacts().
   base::OneShotTimer<GoogleContactStore> update_timer_;