Merge arc/common/settings.mojom into intent_helper.mojom

components/arc/arc_bridge_service.cc

Index: components/arc/arc_bridge_service.cc
diff --git a/components/arc/arc_bridge_service.cc b/components/arc/arc_bridge_service.cc
index 844f5c88232fcff21e719015f51cfb3a93fd49d1..62bbcf736f9a65566ad7843792bb2b34e511a7d9 100644
--- a/components/arc/arc_bridge_service.cc
+++ b/components/arc/arc_bridge_service.cc
@@ -69,8 +69,6 @@ void ArcBridgeService::AddObserver(Observer* observer) {
     observer->OnPowerInstanceReady();
   if (process_instance())
     observer->OnProcessInstanceReady();
-  if (settings_instance())
-    observer->OnSettingsInstanceReady();
   if (video_instance())
     observer->OnVideoInstanceReady();
 }
@@ -304,27 +302,7 @@ void ArcBridgeService::CloseProcessChannel() {
 
 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_);
-  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());
+  // Obsolete interface.
 }
 
 void ArcBridgeService::OnVideoInstanceReady(VideoInstancePtr video_ptr) {
@@ -382,7 +360,6 @@ void ArcBridgeService::CloseAllChannels() {
   CloseNotificationsChannel();
   ClosePowerChannel();
   CloseProcessChannel();
-  CloseSettingsChannel();
   CloseVideoChannel();
 }