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

components/arc/arc_service_manager.h

Index: components/arc/arc_service_manager.h
diff --git a/components/arc/arc_service_manager.h b/components/arc/arc_service_manager.h
index 205eb7ba0df054bd924fa24ede84d6d95f6dfbf9..41b63ab8e6b1f071ab745779ee027562758877ff 100644
--- a/components/arc/arc_service_manager.h
+++ b/components/arc/arc_service_manager.h
@@ -20,7 +20,6 @@ class ArcInputBridge;
 class ArcIntentHelperBridge;
 class ArcNotificationManager;
 class ArcPowerBridge;
-class ArcSettingsBridge;
 class ArcVideoBridge;
 
 // Manages creation and destruction of services that communicate with the ARC
@@ -29,7 +28,6 @@ class ArcServiceManager {
  public:
   ArcServiceManager(scoped_ptr<ArcAuthService> auth_service,
                     scoped_ptr<ArcIntentHelperBridge> intent_helper_bridge,
-                    scoped_ptr<ArcSettingsBridge> settings_bridge,
                     scoped_ptr<ArcVideoBridge> video_bridge);
   virtual ~ArcServiceManager();
 
@@ -55,7 +53,6 @@ class ArcServiceManager {
   scoped_ptr<ArcInputBridge> arc_input_bridge_;
   scoped_ptr<ArcIntentHelperBridge> arc_intent_helper_bridge_;
   scoped_ptr<ArcNotificationManager> arc_notification_manager_;
-  scoped_ptr<ArcSettingsBridge> arc_settings_bridge_;
   scoped_ptr<ArcPowerBridge> arc_power_bridge_;
   scoped_ptr<ArcVideoBridge> arc_video_bridge_;