| Index: chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_file_sync_client.cc b/chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| index 2d9c505d7cddb130b0f6723ab019a916d9ccf174..b0006ce6eae0db46c70405076b7287d9795e5786 100644
|
| --- a/chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| +++ b/chrome/browser/sync_file_system/drive_file_sync_client.cc
|
| @@ -73,7 +73,7 @@ DriveFileSyncClient::DriveFileSyncClient(Profile* profile)
|
| "" /* 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()));
|
| }
|
| @@ -96,14 +96,14 @@ DriveFileSyncClient::DriveFileSyncClient(
|
| 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();
|
| }
|
| @@ -391,7 +391,7 @@ void DriveFileSyncClient::OnReadyToPerformOperations() {
|
| FOR_EACH_OBSERVER(DriveFileSyncClientObserver, observers_, OnAuthenticated());
|
| }
|
|
|
| -void DriveFileSyncClient::OnConnectionTypeChanged(
|
| +void DriveFileSyncClient::OnNetworkChanged(
|
| net::NetworkChangeNotifier::ConnectionType type) {
|
| DCHECK(CalledOnValidThread());
|
| if (type != net::NetworkChangeNotifier::CONNECTION_NONE)
|
|
|