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

components/arc/arc_bridge_service.h

Index: components/arc/arc_bridge_service.h
diff --git a/components/arc/arc_bridge_service.h b/components/arc/arc_bridge_service.h
index 7c4586d88fca89cde9071e46baf6cccf00397811..7e358331e289e622ad6129e65126c4a48401b604 100644
--- a/components/arc/arc_bridge_service.h
+++ b/components/arc/arc_bridge_service.h
@@ -109,10 +109,6 @@ class ArcBridgeService : public ArcBridgeHost {
     virtual void OnProcessInstanceReady() {}
     virtual void OnProcessInstanceClosed() {}
 
-    // Called whenever the ARC settings interface state changes.
-    virtual void OnSettingsInstanceReady() {}
-    virtual void OnSettingsInstanceClosed() {}
-
     // Called whenever the ARC video interface state changes.
     virtual void OnVideoInstanceReady() {}
     virtual void OnVideoInstanceClosed() {}
@@ -167,7 +163,6 @@ class ArcBridgeService : public ArcBridgeHost {
   }
   PowerInstance* power_instance() { return power_ptr_.get(); }
   ProcessInstance* process_instance() { return process_ptr_.get(); }
-  SettingsInstance* settings_instance() { return settings_ptr_.get(); }
   VideoInstance* video_instance() { return video_ptr_.get(); }
 
   int32_t app_version() const { return app_ptr_.version(); }
@@ -179,7 +174,6 @@ class ArcBridgeService : public ArcBridgeHost {
   int32_t notifications_version() const { return notifications_ptr_.version(); }
   int32_t power_version() const { return power_ptr_.version(); }
   int32_t process_version() const { return process_ptr_.version(); }
-  int32_t settings_version() const { return settings_ptr_.version(); }
   int32_t video_version() const { return video_ptr_.version(); }
 
   // ArcHost:
@@ -194,7 +188,7 @@ class ArcBridgeService : public ArcBridgeHost {
       NotificationsInstancePtr notifications_ptr) override;
   void OnPowerInstanceReady(PowerInstancePtr power_ptr) override;
   void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override;
-  void OnSettingsInstanceReady(SettingsInstancePtr process_ptr) override;
+  void OnSettingsInstanceReady(SettingsInstancePtr settings_ptr) override;
   void OnVideoInstanceReady(VideoInstancePtr video_ptr) override;
 
   // Gets the current state of the bridge service.
@@ -236,7 +230,6 @@ class ArcBridgeService : public ArcBridgeHost {
   void CloseNotificationsChannel();
   void ClosePowerChannel();
   void CloseProcessChannel();
-  void CloseSettingsChannel();
   void CloseVideoChannel();
 
   // Callbacks for QueryVersion.
@@ -249,7 +242,6 @@ class ArcBridgeService : public ArcBridgeHost {
   void OnNotificationsVersionReady(int32_t version);
   void OnPowerVersionReady(int32_t version);
   void OnProcessVersionReady(int32_t version);
-  void OnSettingsVersionReady(int32_t version);
   void OnVideoVersionReady(int32_t version);
 
   // Mojo interfaces.
@@ -262,7 +254,6 @@ class ArcBridgeService : public ArcBridgeHost {
   NotificationsInstancePtr notifications_ptr_;
   PowerInstancePtr power_ptr_;
   ProcessInstancePtr process_ptr_;
-  SettingsInstancePtr settings_ptr_;
   VideoInstancePtr video_ptr_;
 
   // Temporary Mojo interfaces.  After a Mojo interface pointer has been
@@ -280,7 +271,6 @@ class ArcBridgeService : public ArcBridgeHost {
   NotificationsInstancePtr temporary_notifications_ptr_;
   PowerInstancePtr temporary_power_ptr_;
   ProcessInstancePtr temporary_process_ptr_;
-  SettingsInstancePtr temporary_settings_ptr_;
   VideoInstancePtr temporary_video_ptr_;
 
   base::ObserverList<Observer> observer_list_;