Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

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 20 matching lines @@
 namespace contacts {
 
 class Contact;
 class ContactDatabaseInterface;
 class GDataContactsServiceInterface;
 class UpdateMetadata;
 
 // A collection of contacts from a Google account.
 class GoogleContactStore
     : public ContactStore,
-      public net::NetworkChangeNotifier::ConnectionTypeObserver {
+      public net::NetworkChangeNotifier::NetworkChangeObserver {
  public:
   class TestAPI {
    public:
     explicit TestAPI(GoogleContactStore* store);
     ~TestAPI();
 
     bool update_scheduled() { return store_->update_timer_.IsRunning(); }
     base::Time last_contact_update_time() const {
       return store_->last_contact_update_time_;
     }
@@ skipping 29 matching lines @@
       Profile* profile);
   virtual ~GoogleContactStore();
 
   // ContactStore implementation:
   virtual void Init() OVERRIDE;
   virtual void AppendContacts(ContactPointers* contacts_out) OVERRIDE;
   virtual const Contact* GetContactById(const std::string& contact_id) OVERRIDE;
   virtual void AddObserver(ContactStoreObserver* observer) OVERRIDE;
   virtual void RemoveObserver(ContactStoreObserver* observer) OVERRIDE;
 
-  // net::NetworkChangeNotifier::ConnectionTypeObserver implementation:
-  virtual void OnConnectionTypeChanged(
+  // net::NetworkChangeNotifier::NetworkChangeObserver implementation:
+  virtual void OnNetworkChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
  private:
   // Returns the current time. Uses |current_time_for_testing_| instead if it's
   // set.
   base::Time GetCurrentTime() const;
 
   // Destroys |db_| if non-NULL and resets the pointer.
   // The underlying data is preserved on-disk.
   void DestroyDatabase();
@@ skipping 91 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_