Add module suffix in .mojom files for components/arc

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 6fe53a1e6df8f9e966f8737e9e048297dce5bb5a..a47682e36e2b8c16f81a4521b77de600f873b7e4 100644
--- a/components/arc/arc_bridge_service.h
+++ b/components/arc/arc_bridge_service.h
@@ -27,7 +27,7 @@ class ArcBridgeBootstrap;
 // The Chrome-side service that handles ARC instances and ARC bridge creation.
 // This service handles the lifetime of ARC instances and sets up the
 // communication channel (the ARC bridge) used to send and receive messages.
-class ArcBridgeService : public ArcBridgeHost {
+class ArcBridgeService : public mojom::ArcBridgeHost {
  public:
   // The possible states of the bridge.  In the normal flow, the state changes
   // in the following sequence:
@@ -170,27 +170,31 @@ class ArcBridgeService : public ArcBridgeHost {
   // nullptr if that particular service is not ready yet. Use an Observer if
   // you want to be notified when this is ready. This can only be called on the
   // thread that this class was created on.
-  AppInstance* app_instance() { return app_ptr_.get(); }
-  AudioInstance* audio_instance() { return audio_ptr_.get(); }
-  AuthInstance* auth_instance() { return auth_ptr_.get(); }
-  BluetoothInstance* bluetooth_instance() { return bluetooth_ptr_.get(); }
-  ClipboardInstance* clipboard_instance() { return clipboard_ptr_.get(); }
-  CrashCollectorInstance* crash_collector_instance() {
+  mojom::AppInstance* app_instance() { return app_ptr_.get(); }
+  mojom::AudioInstance* audio_instance() { return audio_ptr_.get(); }
+  mojom::AuthInstance* auth_instance() { return auth_ptr_.get(); }
+  mojom::BluetoothInstance* bluetooth_instance() {
+    return bluetooth_ptr_.get();
+  }
+  mojom::ClipboardInstance* clipboard_instance() {
+    return clipboard_ptr_.get();
+  }
+  mojom::CrashCollectorInstance* crash_collector_instance() {
     return crash_collector_ptr_.get();
   }
-  ImeInstance* ime_instance() { return ime_ptr_.get(); }
-  InputInstance* input_instance() { return input_ptr_.get(); }
-  IntentHelperInstance* intent_helper_instance() {
+  mojom::ImeInstance* ime_instance() { return ime_ptr_.get(); }
+  mojom::InputInstance* input_instance() { return input_ptr_.get(); }
+  mojom::IntentHelperInstance* intent_helper_instance() {
     return intent_helper_ptr_.get();
   }
-  NetInstance* net_instance() { return net_ptr_.get(); }
-  NotificationsInstance* notifications_instance() {
+  mojom::NetInstance* net_instance() { return net_ptr_.get(); }
+  mojom::NotificationsInstance* notifications_instance() {
     return notifications_ptr_.get();
   }
-  PolicyInstance* policy_instance() { return policy_ptr_.get(); }
-  PowerInstance* power_instance() { return power_ptr_.get(); }
-  ProcessInstance* process_instance() { return process_ptr_.get(); }
-  VideoInstance* video_instance() { return video_ptr_.get(); }
+  mojom::PolicyInstance* policy_instance() { return policy_ptr_.get(); }
+  mojom::PowerInstance* power_instance() { return power_ptr_.get(); }
+  mojom::ProcessInstance* process_instance() { return process_ptr_.get(); }
+  mojom::VideoInstance* video_instance() { return video_ptr_.get(); }
 
   int32_t app_version() const { return app_ptr_.version(); }
   int32_t audio_version() const { return audio_ptr_.version(); }
@@ -211,24 +215,26 @@ class ArcBridgeService : public ArcBridgeHost {
   int32_t video_version() const { return video_ptr_.version(); }
 
   // ArcHost:
-  void OnAppInstanceReady(AppInstancePtr app_ptr) override;
-  void OnAudioInstanceReady(AudioInstancePtr audio_ptr) override;
-  void OnAuthInstanceReady(AuthInstancePtr auth_ptr) override;
-  void OnBluetoothInstanceReady(BluetoothInstancePtr bluetooth_ptr) override;
-  void OnClipboardInstanceReady(ClipboardInstancePtr clipboard_ptr) override;
+  void OnAppInstanceReady(mojom::AppInstancePtr app_ptr) override;
+  void OnAudioInstanceReady(mojom::AudioInstancePtr audio_ptr) override;
+  void OnAuthInstanceReady(mojom::AuthInstancePtr auth_ptr) override;
+  void OnBluetoothInstanceReady(
+      mojom::BluetoothInstancePtr bluetooth_ptr) override;
+  void OnClipboardInstanceReady(
+      mojom::ClipboardInstancePtr clipboard_ptr) override;
   void OnCrashCollectorInstanceReady(
-      CrashCollectorInstancePtr crash_collector_ptr) override;
-  void OnImeInstanceReady(ImeInstancePtr ime_ptr) override;
-  void OnInputInstanceReady(InputInstancePtr input_ptr) override;
+      mojom::CrashCollectorInstancePtr crash_collector_ptr) override;
+  void OnImeInstanceReady(mojom::ImeInstancePtr ime_ptr) override;
+  void OnInputInstanceReady(mojom::InputInstancePtr input_ptr) override;
   void OnIntentHelperInstanceReady(
-      IntentHelperInstancePtr intent_helper_ptr) override;
-  void OnNetInstanceReady(NetInstancePtr net_ptr) override;
+      mojom::IntentHelperInstancePtr intent_helper_ptr) override;
+  void OnNetInstanceReady(mojom::NetInstancePtr net_ptr) override;
   void OnNotificationsInstanceReady(
-      NotificationsInstancePtr notifications_ptr) override;
-  void OnPolicyInstanceReady(PolicyInstancePtr policy_ptr) override;
-  void OnPowerInstanceReady(PowerInstancePtr power_ptr) override;
-  void OnProcessInstanceReady(ProcessInstancePtr process_ptr) override;
-  void OnVideoInstanceReady(VideoInstancePtr video_ptr) override;
+      mojom::NotificationsInstancePtr notifications_ptr) override;
+  void OnPolicyInstanceReady(mojom::PolicyInstancePtr policy_ptr) override;
+  void OnPowerInstanceReady(mojom::PowerInstancePtr power_ptr) override;
+  void OnProcessInstanceReady(mojom::ProcessInstancePtr process_ptr) override;
+  void OnVideoInstanceReady(mojom::VideoInstancePtr video_ptr) override;
 
   // Gets the current state of the bridge service.
   State state() const { return state_; }
@@ -294,21 +300,21 @@ class ArcBridgeService : public ArcBridgeHost {
   void OnVideoVersionReady(int32_t version);
 
   // Mojo interfaces.
-  AppInstancePtr app_ptr_;
-  AudioInstancePtr audio_ptr_;
-  AuthInstancePtr auth_ptr_;
-  BluetoothInstancePtr bluetooth_ptr_;
-  ClipboardInstancePtr clipboard_ptr_;
-  CrashCollectorInstancePtr crash_collector_ptr_;
-  ImeInstancePtr ime_ptr_;
-  InputInstancePtr input_ptr_;
-  IntentHelperInstancePtr intent_helper_ptr_;
-  NetInstancePtr net_ptr_;
-  NotificationsInstancePtr notifications_ptr_;
-  PolicyInstancePtr policy_ptr_;
-  PowerInstancePtr power_ptr_;
-  ProcessInstancePtr process_ptr_;
-  VideoInstancePtr video_ptr_;
+  mojom::AppInstancePtr app_ptr_;
+  mojom::AudioInstancePtr audio_ptr_;
+  mojom::AuthInstancePtr auth_ptr_;
+  mojom::BluetoothInstancePtr bluetooth_ptr_;
+  mojom::ClipboardInstancePtr clipboard_ptr_;
+  mojom::CrashCollectorInstancePtr crash_collector_ptr_;
+  mojom::ImeInstancePtr ime_ptr_;
+  mojom::InputInstancePtr input_ptr_;
+  mojom::IntentHelperInstancePtr intent_helper_ptr_;
+  mojom::NetInstancePtr net_ptr_;
+  mojom::NotificationsInstancePtr notifications_ptr_;
+  mojom::PolicyInstancePtr policy_ptr_;
+  mojom::PowerInstancePtr power_ptr_;
+  mojom::ProcessInstancePtr process_ptr_;
+  mojom::VideoInstancePtr video_ptr_;
 
   // Temporary Mojo interfaces.  After a Mojo interface pointer has been
   // received from the other endpoint, we still need to asynchronously query
@@ -316,21 +322,21 @@ class ArcBridgeService : public ArcBridgeHost {
   // the xxx_instance() functions.
   // To keep the xxx_instance() functions being trivial, store the instance
   // pointer in a temporary variable to avoid losing its reference.
-  AppInstancePtr temporary_app_ptr_;
-  AudioInstancePtr temporary_audio_ptr_;
-  AuthInstancePtr temporary_auth_ptr_;
-  BluetoothInstancePtr temporary_bluetooth_ptr_;
-  ClipboardInstancePtr temporary_clipboard_ptr_;
-  CrashCollectorInstancePtr temporary_crash_collector_ptr_;
-  ImeInstancePtr temporary_ime_ptr_;
-  InputInstancePtr temporary_input_ptr_;
-  IntentHelperInstancePtr temporary_intent_helper_ptr_;
-  NetInstancePtr temporary_net_ptr_;
-  NotificationsInstancePtr temporary_notifications_ptr_;
-  PolicyInstancePtr temporary_policy_ptr_;
-  PowerInstancePtr temporary_power_ptr_;
-  ProcessInstancePtr temporary_process_ptr_;
-  VideoInstancePtr temporary_video_ptr_;
+  mojom::AppInstancePtr temporary_app_ptr_;
+  mojom::AudioInstancePtr temporary_audio_ptr_;
+  mojom::AuthInstancePtr temporary_auth_ptr_;
+  mojom::BluetoothInstancePtr temporary_bluetooth_ptr_;
+  mojom::ClipboardInstancePtr temporary_clipboard_ptr_;
+  mojom::CrashCollectorInstancePtr temporary_crash_collector_ptr_;
+  mojom::ImeInstancePtr temporary_ime_ptr_;
+  mojom::InputInstancePtr temporary_input_ptr_;
+  mojom::IntentHelperInstancePtr temporary_intent_helper_ptr_;
+  mojom::NetInstancePtr temporary_net_ptr_;
+  mojom::NotificationsInstancePtr temporary_notifications_ptr_;
+  mojom::PolicyInstancePtr temporary_policy_ptr_;
+  mojom::PowerInstancePtr temporary_power_ptr_;
+  mojom::ProcessInstancePtr temporary_process_ptr_;
+  mojom::VideoInstancePtr temporary_video_ptr_;
 
   base::ObserverList<Observer> observer_list_;