| Index: components/proximity_auth/messenger_impl.cc
|
| diff --git a/components/proximity_auth/messenger_impl.cc b/components/proximity_auth/messenger_impl.cc
|
| index 1a0d0279b99338c044690c54009780d7205f3c96..05169bfa23268c5acd1c2e1745ec578d47edebae 100644
|
| --- a/components/proximity_auth/messenger_impl.cc
|
| +++ b/components/proximity_auth/messenger_impl.cc
|
| @@ -115,8 +115,8 @@ void MessengerImpl::RequestDecryption(const std::string& challenge) {
|
| if (!SupportsSignIn()) {
|
| PA_LOG(WARNING) << "Dropping decryption request, as remote device "
|
| << "does not support protocol v3.1.";
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_,
|
| - OnDecryptResponse(std::string()));
|
| + for (auto& observer : observers_)
|
| + observer.OnDecryptResponse(std::string());
|
| return;
|
| }
|
|
|
| @@ -137,7 +137,8 @@ void MessengerImpl::RequestUnlock() {
|
| if (!SupportsSignIn()) {
|
| PA_LOG(WARNING) << "Dropping unlock request, as remote device does not "
|
| << "support protocol v3.1.";
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_, OnUnlockResponse(false));
|
| + for (auto& observer : observers_)
|
| + observer.OnUnlockResponse(false);
|
| return;
|
| }
|
|
|
| @@ -189,8 +190,8 @@ void MessengerImpl::OnMessageDecoded(const std::string& decoded_message) {
|
| (decoded_message == kScreenUnlocked ? USER_PRESENT : USER_ABSENT);
|
| update.secure_screen_lock_state = SECURE_SCREEN_LOCK_ENABLED;
|
| update.trust_agent_state = TRUST_AGENT_ENABLED;
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_,
|
| - OnRemoteStatusUpdate(update));
|
| + for (auto& observer : observers_)
|
| + observer.OnRemoteStatusUpdate(update);
|
| pending_message_.reset();
|
| ProcessMessageQueue();
|
| return;
|
| @@ -263,8 +264,8 @@ void MessengerImpl::HandleRemoteStatusUpdateMessage(
|
| return;
|
| }
|
|
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_,
|
| - OnRemoteStatusUpdate(*status_update));
|
| + for (auto& observer : observers_)
|
| + observer.OnRemoteStatusUpdate(*status_update);
|
| }
|
|
|
| void MessengerImpl::HandleDecryptResponseMessage(
|
| @@ -279,13 +280,14 @@ void MessengerImpl::HandleDecryptResponseMessage(
|
| PA_LOG(ERROR) << "Unable to base64-decode decrypt response.";
|
| }
|
|
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_,
|
| - OnDecryptResponse(decrypted_data));
|
| + for (auto& observer : observers_)
|
| + observer.OnDecryptResponse(decrypted_data);
|
| }
|
|
|
| void MessengerImpl::HandleUnlockResponseMessage(
|
| const base::DictionaryValue& message) {
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_, OnUnlockResponse(true));
|
| + for (auto& observer : observers_)
|
| + observer.OnUnlockResponse(true);
|
| }
|
|
|
| void MessengerImpl::PollScreenStateForIOS() {
|
| @@ -310,7 +312,8 @@ void MessengerImpl::OnConnectionStatusChanged(Connection* connection,
|
| if (new_status == Connection::DISCONNECTED) {
|
| PA_LOG(INFO) << "Secure channel disconnected...";
|
| connection_->RemoveObserver(this);
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_, OnDisconnected());
|
| + for (auto& observer : observers_)
|
| + observer.OnDisconnected();
|
| // TODO(isherman): Determine whether it's also necessary/appropriate to fire
|
| // this notification from the destructor.
|
| }
|
| @@ -342,13 +345,14 @@ void MessengerImpl::OnSendCompleted(const Connection& connection,
|
| // For local events, we don't expect a response, so on success, we
|
| // notify observers right away.
|
| if (pending_message_->type == kMessageTypeDecryptRequest) {
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_,
|
| - OnDecryptResponse(std::string()));
|
| + for (auto& observer : observers_)
|
| + observer.OnDecryptResponse(std::string());
|
| } else if (pending_message_->type == kMessageTypeUnlockRequest) {
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_, OnUnlockResponse(false));
|
| + for (auto& observer : observers_)
|
| + observer.OnUnlockResponse(false);
|
| } else if (pending_message_->type == kMessageTypeLocalEvent) {
|
| - FOR_EACH_OBSERVER(MessengerObserver, observers_,
|
| - OnUnlockEventSent(success));
|
| + for (auto& observer : observers_)
|
| + observer.OnUnlockEventSent(success);
|
| } else {
|
| PA_LOG(ERROR) << "Message of unknown type '" << pending_message_->type
|
| << "' sent.";
|
|
|