| Index: chromeos/network/network_connection_handler.cc
|
| diff --git a/chromeos/network/network_connection_handler.cc b/chromeos/network/network_connection_handler.cc
|
| index c4f5856d72a4bea216be5ed595374d33fca54cb4..b79c360c8cabb4b813ba40c7edf3401f532871ea 100644
|
| --- a/chromeos/network/network_connection_handler.cc
|
| +++ b/chromeos/network/network_connection_handler.cc
|
| @@ -226,8 +226,8 @@ void NetworkConnectionHandler::ConnectToNetwork(
|
| const network_handler::ErrorCallback& error_callback,
|
| bool check_error_state) {
|
| NET_LOG_USER("ConnectToNetwork", service_path);
|
| - FOR_EACH_OBSERVER(NetworkConnectionObserver, observers_,
|
| - ConnectToNetworkRequested(service_path));
|
| + for (auto& observer : observers_)
|
| + observer.ConnectToNetworkRequested(service_path);
|
|
|
| // Clear any existing queued connect request.
|
| queued_connect_.reset();
|
| @@ -313,8 +313,8 @@ void NetworkConnectionHandler::DisconnectNetwork(
|
| const base::Closure& success_callback,
|
| const network_handler::ErrorCallback& error_callback) {
|
| NET_LOG_USER("DisconnectNetwork", service_path);
|
| - FOR_EACH_OBSERVER(NetworkConnectionObserver, observers_,
|
| - DisconnectRequested(service_path));
|
| + for (auto& observer : observers_)
|
| + observer.DisconnectRequested(service_path);
|
|
|
| const NetworkState* network =
|
| network_state_handler_->GetNetworkState(service_path);
|
| @@ -762,8 +762,8 @@ void NetworkConnectionHandler::InvokeConnectSuccessCallback(
|
| NET_LOG_EVENT("Connect Request Succeeded", service_path);
|
| if (!success_callback.is_null())
|
| success_callback.Run();
|
| - FOR_EACH_OBSERVER(NetworkConnectionObserver, observers_,
|
| - ConnectSucceeded(service_path));
|
| + for (auto& observer : observers_)
|
| + observer.ConnectSucceeded(service_path);
|
| }
|
|
|
| void NetworkConnectionHandler::ErrorCallbackForPendingRequest(
|
| @@ -788,8 +788,8 @@ void NetworkConnectionHandler::InvokeConnectErrorCallback(
|
| NET_LOG_ERROR("Connect Failure: " + error_name, service_path);
|
| network_handler::RunErrorCallback(error_callback, service_path, error_name,
|
| "");
|
| - FOR_EACH_OBSERVER(NetworkConnectionObserver, observers_,
|
| - ConnectFailed(service_path, error_name));
|
| + for (auto& observer : observers_)
|
| + observer.ConnectFailed(service_path, error_name);
|
| }
|
|
|
| // Disconnect
|
|
|