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 d3448c515faef55fe3c529c321f4c617c05a62b2..366675368e9dd1f13543bceaf166061bf41f1704 100644
--- a/components/arc/arc_bridge_service.cc
+++ b/components/arc/arc_bridge_service.cc
@@ -278,31 +278,6 @@ void ArcBridgeService::CloseProcessChannel() {
   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_);
-  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);
@@ -358,7 +333,6 @@ void ArcBridgeService::CloseAllChannels() {
   CloseNotificationsChannel();
   ClosePowerChannel();
   CloseProcessChannel();
-  CloseSettingsChannel();
   CloseVideoChannel();
 }