contacts: Make GoogleContactStore own GDataContactsService.

chrome/browser/chromeos/contacts/google_contact_store.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CONTACTS_GOOGLE_CONTACT_STORE_H_
 #define CHROME_BROWSER_CHROMEOS_CONTACTS_GOOGLE_CONTACT_STORE_H_
 
 #include "chrome/browser/chromeos/contacts/contact_store.h"
 
 #include <map>
@@ skipping 35 matching lines @@
 
     bool update_scheduled() { return store_->update_timer_.IsRunning(); }
 
     void set_current_time(const base::Time& time) {
       store_->current_time_for_testing_ = time;
     }
 
     // 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.
     void DoUpdate();
 
     // Notifies the store that the system has gone online or offline.
     void NotifyAboutNetworkStateChange(bool online);
 
    private:
     GoogleContactStore* store_;  // not owned
@@ skipping 69 matching lines @@
   // Owns the pointed-to Contact values.
   ContactMap contacts_;
 
   // Deletes values in |contacts_|.
   STLValueDeleter<ContactMap> contacts_deleter_;
 
   // Most-recent time that an entry in |contacts_| has been updated (as reported
   // 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_;
 
   // Time at which the last successful update was started.
   base::Time last_successful_update_start_time_;
 
   // Amount of time that we'll wait before retrying the next time that an update
   // fails.
   base::TimeDelta update_delay_on_next_failure_;
 
@@ skipping 26 matching lines @@
   virtual bool CanCreateContactStoreForProfile(Profile* profile) OVERRIDE;
   virtual ContactStore* CreateContactStore(Profile* profile) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GoogleContactStoreFactory);
 };
 
 }  // namespace contacts
 
 #endif  // CHROME_BROWSER_CHROMEOS_CONTACTS_GOOGLE_CONTACT_STORE_H_