Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

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"
@@ skipping 62 matching lines @@
 
 void GoogleContactStore::TestAPI::DoUpdate() {
   store_->UpdateContacts();
 }
 
 void GoogleContactStore::TestAPI::NotifyAboutNetworkStateChange(bool online) {
   net::NetworkChangeNotifier::ConnectionType type =
       online ?
       net::NetworkChangeNotifier::CONNECTION_UNKNOWN :
       net::NetworkChangeNotifier::CONNECTION_NONE;
-  store_->OnConnectionTypeChanged(type);
+  store_->OnNetworkChanged(type);
 }
 
 scoped_ptr<ContactPointers> GoogleContactStore::TestAPI::GetLoadedContacts() {
   scoped_ptr<ContactPointers> contacts(new ContactPointers);
   for (ContactMap::const_iterator it = store_->contacts_.begin();
        it != store_->contacts_.end(); ++it) {
     contacts->push_back(it->second);
   }
   return contacts.Pass();
 }
 
 GoogleContactStore::GoogleContactStore(
     net::URLRequestContextGetter* url_request_context_getter,
     Profile* profile)
     : url_request_context_getter_(url_request_context_getter),
       profile_(profile),
       db_(new ContactDatabase),
       update_delay_on_next_failure_(
           base::TimeDelta::FromSeconds(kUpdateFailureInitialRetrySec)),
       is_online_(true),
       should_update_when_online_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
   is_online_ = !net::NetworkChangeNotifier::IsOffline();
 }
 
 GoogleContactStore::~GoogleContactStore() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   weak_ptr_factory_.InvalidateWeakPtrs();
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(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 GDataContactsService(
         url_request_context_getter_, profile_));
@@ skipping 29 matching lines @@
   DCHECK(observer);
   observers_.AddObserver(observer);
 }
 
 void GoogleContactStore::RemoveObserver(ContactStoreObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
-void GoogleContactStore::OnConnectionTypeChanged(
+void GoogleContactStore::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   bool was_online = is_online_;
   is_online_ = (type != net::NetworkChangeNotifier::CONNECTION_NONE);
   if (!was_online && is_online_ && should_update_when_online_) {

[szym, 2013/01/20 06:52:08]

The logic here is: "if it's a change from offline to online", so it's going to
match any OnNetworkChange caused by IP address change, etc.

It's probably best to ask GoogleContactStore owners if that's ok.

[Daniel Erat, 2013/01/20 14:21:14]

I think that this is okay; I assume that it'll just be a no-op if we remained
online and just got a new IP.  The important part is that this is called
whenever we transition from offline to online.  Getting called more often than
that is fine.

     should_update_when_online_ = false;
     UpdateContacts();
   }
 }
 
 base::Time GoogleContactStore::GetCurrentTime() const {
   return !current_time_for_testing_.is_null() ?
          current_time_for_testing_ :
          base::Time::Now();
 }
@@ skipping 229 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