Revert of Reland "arc-bridge: Move most methods to Mojo interfaces"

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 38 matching lines @@
 void ArcBridgeService::AddObserver(Observer* observer) {
   DCHECK(CalledOnValidThread());
   observer_list_.AddObserver(observer);
 }
 
 void ArcBridgeService::RemoveObserver(Observer* observer) {
   DCHECK(CalledOnValidThread());
   observer_list_.RemoveObserver(observer);
 }
 
-void ArcBridgeService::OnAppInstanceReady(AppInstancePtr app_ptr) {
+void ArcBridgeService::AddNotificationObserver(NotificationObserver* observer) {
   DCHECK(CalledOnValidThread());
-  app_ptr_ = std::move(app_ptr);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnAppInstanceReady());
+  notification_observer_list_.AddObserver(observer);
 }
 
-void ArcBridgeService::OnInputInstanceReady(InputInstancePtr input_ptr) {
+void ArcBridgeService::RemoveNotificationObserver(
+    NotificationObserver* observer) {
   DCHECK(CalledOnValidThread());
-  input_ptr_ = std::move(input_ptr);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnInputInstanceReady());
+  notification_observer_list_.RemoveObserver(observer);
 }
 
-void ArcBridgeService::OnNotificationsInstanceReady(
-    NotificationsInstancePtr notifications_ptr) {
+void ArcBridgeService::AddAppObserver(AppObserver* observer) {
   DCHECK(CalledOnValidThread());
-  notifications_ptr_ = std::move(notifications_ptr);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnNotificationsInstanceReady());
+  app_observer_list_.AddObserver(observer);
 }
 
-void ArcBridgeService::OnPowerInstanceReady(PowerInstancePtr power_ptr) {
+void ArcBridgeService::RemoveAppObserver(AppObserver* observer) {
   DCHECK(CalledOnValidThread());
-  power_ptr_ = std::move(power_ptr);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnPowerInstanceReady());
+  app_observer_list_.RemoveObserver(observer);
 }
 
-void ArcBridgeService::OnProcessInstanceReady(ProcessInstancePtr process_ptr) {
+void ArcBridgeService::AddProcessObserver(ProcessObserver* observer) {
   DCHECK(CalledOnValidThread());
-  process_ptr_ = std::move(process_ptr);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnProcessInstanceReady());
+  process_observer_list_.AddObserver(observer);
 }
 
-void ArcBridgeService::OnSettingsInstanceReady(
-    SettingsInstancePtr settings_ptr) {
+void ArcBridgeService::RemoveProcessObserver(ProcessObserver* observer) {
   DCHECK(CalledOnValidThread());
-  settings_ptr_ = std::move(settings_ptr);
-  FOR_EACH_OBSERVER(Observer, observer_list(), OnSettingsInstanceReady());
+  process_observer_list_.RemoveObserver(observer);
 }
 
 void ArcBridgeService::SetState(State state) {
   DCHECK(CalledOnValidThread());
   // DCHECK on enum classes not supported.
   DCHECK(state_ != state);
   state_ = state;
   FOR_EACH_OBSERVER(Observer, observer_list(), OnStateChanged(state_));
 }
 
 void ArcBridgeService::SetAvailable(bool available) {
   DCHECK(CalledOnValidThread());
   DCHECK(available_ != available);
   available_ = available;
   FOR_EACH_OBSERVER(Observer, observer_list(), OnAvailableChanged(available_));
 }
 
 bool ArcBridgeService::CalledOnValidThread() {
   return thread_checker_.CalledOnValidThread();
 }
 
 }  // namespace arc