Switch from OnIPAddressChanged and OnConnectionTypeChange to OnNetworkChanged

chrome/browser/sync_file_system/drive_file_sync_client.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/sync_file_system/drive_file_sync_client.h"
 
 #include <sstream>
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 55 matching lines @@
 
 DriveFileSyncClient::DriveFileSyncClient(Profile* profile)
     : url_generator_(GURL(
           google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction)) {
   drive_service_.reset(new google_apis::GDataWapiService(
       profile->GetRequestContext(),
       GURL(google_apis::GDataWapiUrlGenerator::kBaseUrlForProduction),
       "" /* custom_user_agent */));
   drive_service_->Initialize(profile);
   drive_service_->AddObserver(this);
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 
   drive_uploader_.reset(new google_apis::DriveUploader(drive_service_.get()));
 }
 
 scoped_ptr<DriveFileSyncClient> DriveFileSyncClient::CreateForTesting(
     Profile* profile,
     const GURL& base_url,
     scoped_ptr<google_apis::DriveServiceInterface> drive_service,
     scoped_ptr<google_apis::DriveUploaderInterface> drive_uploader) {
   return make_scoped_ptr(new DriveFileSyncClient(
       profile, base_url, drive_service.Pass(), drive_uploader.Pass()));
 }
 
 DriveFileSyncClient::DriveFileSyncClient(
     Profile* profile,
     const GURL& base_url,
     scoped_ptr<google_apis::DriveServiceInterface> drive_service,
     scoped_ptr<google_apis::DriveUploaderInterface> drive_uploader)
     : url_generator_(base_url) {
   drive_service_ = drive_service.Pass();
   drive_service_->Initialize(profile);
   drive_service_->AddObserver(this);
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::AddNetworkChangeObserver(this);
 
   drive_uploader_ = drive_uploader.Pass();
 }
 
 DriveFileSyncClient::~DriveFileSyncClient() {
   DCHECK(CalledOnValidThread());
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  net::NetworkChangeNotifier::RemoveNetworkChangeObserver(this);
   drive_service_->RemoveObserver(this);
   drive_service_->CancelAll();
 }
 
 void DriveFileSyncClient::AddObserver(DriveFileSyncClientObserver* observer) {
   DCHECK(CalledOnValidThread());
   observers_.AddObserver(observer);
 }
 
 void DriveFileSyncClient::RemoveObserver(
@@ skipping 267 matching lines @@
 GURL DriveFileSyncClient::ResourceIdToResourceLink(
     const std::string& resource_id) const {
   return url_generator_.GenerateResourceEntryUrl(resource_id);
 }
 
 void DriveFileSyncClient::OnReadyToPerformOperations() {
   DCHECK(CalledOnValidThread());
   FOR_EACH_OBSERVER(DriveFileSyncClientObserver, observers_, OnAuthenticated());
 }
 
-void DriveFileSyncClient::OnConnectionTypeChanged(
+void DriveFileSyncClient::OnNetworkChanged(
     net::NetworkChangeNotifier::ConnectionType type) {
   DCHECK(CalledOnValidThread());
   if (type != net::NetworkChangeNotifier::CONNECTION_NONE)
     FOR_EACH_OBSERVER(DriveFileSyncClientObserver,
                       observers_, OnNetworkConnected());
 }
 
 void DriveFileSyncClient::DidGetResourceList(
     const ResourceListCallback& callback,
     google_apis::GDataErrorCode error,
@@ skipping 225 matching lines @@
 }
 
 void DriveFileSyncClient::DidDeleteFile(
     const GDataErrorCallback& callback,
     google_apis::GDataErrorCode error) {
   DCHECK(CalledOnValidThread());
   callback.Run(error);
 }
 
 }  // namespace sync_file_system