Call FOR_EACH_OBSERVER after setting error handler.

components/arc/arc_bridge_service.cc

 // Copyright 2015 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 "components/arc/arc_bridge_service.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/sequenced_task_runner.h"
@@ skipping 48 matching lines @@
 void ArcBridgeService::OnAppInstanceReady(AppInstancePtr app_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_app_ptr_ = std::move(app_ptr);
   temporary_app_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnAppVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnAppVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   app_ptr_ = std::move(temporary_app_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceReady());
   app_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseAppChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceReady());
 }
 
 void ArcBridgeService::CloseAppChannel() {
   DCHECK(CalledOnValidThread());
   if (!app_ptr_)
     return;
 
   app_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceClosed());
 }
 
 void ArcBridgeService::OnAuthInstanceReady(AuthInstancePtr auth_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_auth_ptr_ = std::move(auth_ptr);
   temporary_auth_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnAuthVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnAuthVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   auth_ptr_ = std::move(temporary_auth_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceReady());
   auth_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseAuthChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceReady());
 }
 
 void ArcBridgeService::CloseAuthChannel() {
   DCHECK(CalledOnValidThread());
   if (!input_ptr_)
     return;
 
   auth_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnAuthInstanceClosed());
 }
 
 void ArcBridgeService::OnClipboardInstanceReady(
     ClipboardInstancePtr clipboard_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_clipboard_ptr_ = std::move(clipboard_ptr);
   temporary_clipboard_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnClipboardVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnClipboardVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   clipboard_ptr_ = std::move(temporary_clipboard_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceReady());
   clipboard_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseClipboardChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceReady());
 }
 
 void ArcBridgeService::CloseClipboardChannel() {
   DCHECK(CalledOnValidThread());
   if (!clipboard_ptr_)
     return;
 
   clipboard_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnClipboardInstanceClosed());
 }
 
 void ArcBridgeService::OnInputInstanceReady(InputInstancePtr input_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_input_ptr_ = std::move(input_ptr);
   temporary_input_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnInputVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnInputVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   input_ptr_ = std::move(temporary_input_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceReady());
   input_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseInputChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceReady());
 }
 
 void ArcBridgeService::CloseInputChannel() {
   DCHECK(CalledOnValidThread());
   if (!input_ptr_)
     return;
 
   input_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceClosed());
 }
 
 void ArcBridgeService::OnNotificationsInstanceReady(
     NotificationsInstancePtr notifications_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_notifications_ptr_ = std::move(notifications_ptr);
   temporary_notifications_ptr_.QueryVersion(
       base::Bind(&ArcBridgeService::OnNotificationsVersionReady,
                  weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnNotificationsVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   notifications_ptr_ = std::move(temporary_notifications_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceReady());
   notifications_ptr_.set_connection_error_handler(
       base::Bind(&ArcBridgeService::CloseNotificationsChannel,
                  weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceReady());
 }
 
 void ArcBridgeService::CloseNotificationsChannel() {
   DCHECK(CalledOnValidThread());
   if (!notifications_ptr_)
     return;
 
   notifications_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceClosed());
 }
 
 void ArcBridgeService::OnPowerInstanceReady(PowerInstancePtr power_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_power_ptr_ = std::move(power_ptr);
   temporary_power_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnPowerVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnPowerVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   power_ptr_ = std::move(temporary_power_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceReady());
   power_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::ClosePowerChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceReady());
 }
 
 void ArcBridgeService::ClosePowerChannel() {
   DCHECK(CalledOnValidThread());
   if (!power_ptr_)
     return;
 
   power_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceClosed());
 }
 
 void ArcBridgeService::OnProcessInstanceReady(ProcessInstancePtr process_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_process_ptr_ = std::move(process_ptr);
   temporary_process_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnProcessVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnProcessVersionReady(int32_t version) {
   DCHECK(CalledOnValidThread());
   process_ptr_ = std::move(temporary_process_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceReady());
   process_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseProcessChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceReady());
 }
 
 void ArcBridgeService::CloseProcessChannel() {
   DCHECK(CalledOnValidThread());
   if (!process_ptr_)
     return;
 
   process_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceClosed());
 }
 
 void ArcBridgeService::OnSettingsInstanceReady(
     SettingsInstancePtr settings_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_settings_ptr_ = std::move(settings_ptr);
   temporary_settings_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnSettingsVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnSettingsVersionReady(int32_t version) {
+  DCHECK(CalledOnValidThread());
   settings_ptr_ = std::move(temporary_settings_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnSettingsInstanceReady());
   settings_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseSettingsChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnSettingsInstanceReady());
 }
 
 void ArcBridgeService::CloseSettingsChannel() {
   DCHECK(CalledOnValidThread());
   if (!settings_ptr_)
     return;
 
   settings_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnSettingsInstanceClosed());
 }
 
 void ArcBridgeService::OnVideoInstanceReady(VideoInstancePtr video_ptr) {
   DCHECK(CalledOnValidThread());
   temporary_video_ptr_ = std::move(video_ptr);
   temporary_video_ptr_.QueryVersion(base::Bind(
       &ArcBridgeService::OnVideoVersionReady, weak_factory_.GetWeakPtr()));
 }
 
 void ArcBridgeService::OnVideoVersionReady(int32_t version) {
+  DCHECK(CalledOnValidThread());
   video_ptr_ = std::move(temporary_video_ptr_);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnVideoInstanceReady());
   video_ptr_.set_connection_error_handler(base::Bind(
       &ArcBridgeService::CloseVideoChannel, weak_factory_.GetWeakPtr()));
+  FOR_EACH_OBSERVER(Observer, observer_list(), OnVideoInstanceReady());
 }
 
 void ArcBridgeService::CloseVideoChannel() {
   DCHECK(CalledOnValidThread());
   if (!video_ptr_)
     return;
 
   video_ptr_.reset();
   FOR_EACH_OBSERVER(Observer, observer_list(), OnVideoInstanceClosed());
 }
@@ skipping 25 matching lines @@
   CloseClipboardChannel();
   CloseInputChannel();
   CloseNotificationsChannel();
   ClosePowerChannel();
   CloseProcessChannel();
   CloseSettingsChannel();
   CloseVideoChannel();
 }
 
 }  // namespace arc