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

components/arc/arc_service_manager.cc

Index: components/arc/arc_service_manager.cc
diff --git a/components/arc/arc_service_manager.cc b/components/arc/arc_service_manager.cc
index f6eace9d38a690b3bac965b2e849e799a109246c..59a09d03bb35d8f2c343b227ac317bc378d53fbf 100644
--- a/components/arc/arc_service_manager.cc
+++ b/components/arc/arc_service_manager.cc
@@ -16,7 +16,6 @@
 #include "components/arc/input/arc_input_bridge.h"
 #include "components/arc/intent_helper/arc_intent_helper_bridge.h"
 #include "components/arc/power/arc_power_bridge.h"
-#include "components/arc/settings/arc_settings_bridge.h"
 #include "components/arc/video/arc_video_bridge.h"
 #include "ui/arc/notification/arc_notification_manager.h"
 
@@ -32,7 +31,6 @@ ArcServiceManager* g_arc_service_manager = nullptr;
 ArcServiceManager::ArcServiceManager(
     scoped_ptr<ArcAuthService> auth_service,
     scoped_ptr<ArcIntentHelperBridge> intent_helper_bridge,
-    scoped_ptr<ArcSettingsBridge> settings_bridge,
     scoped_ptr<ArcVideoBridge> video_bridge)
     : arc_bridge_service_(
           new ArcBridgeServiceImpl(ArcBridgeBootstrap::Create())),
@@ -41,13 +39,11 @@ ArcServiceManager::ArcServiceManager(
       arc_ime_bridge_(new ArcImeBridge(arc_bridge_service_.get())),
       arc_input_bridge_(ArcInputBridge::Create(arc_bridge_service_.get())),
       arc_intent_helper_bridge_(std::move(intent_helper_bridge)),
-      arc_settings_bridge_(std::move(settings_bridge)),
       arc_power_bridge_(new ArcPowerBridge(arc_bridge_service_.get())),
       arc_video_bridge_(std::move(video_bridge)) {
   DCHECK(!g_arc_service_manager);
   g_arc_service_manager = this;
 
-  arc_settings_bridge_->StartObservingBridgeServiceChanges();
   arc_auth_service_->StartObservingBridgeServiceChanges();
   arc_intent_helper_bridge_->StartObservingBridgeServiceChanges();
   arc_video_bridge_->StartObservingBridgeServiceChanges();