Rename media::interfaces to media::mojom.

media/mojo/services/mojo_cdm_service.h

Index: media/mojo/services/mojo_cdm_service.h
diff --git a/media/mojo/services/mojo_cdm_service.h b/media/mojo/services/mojo_cdm_service.h
index a9859a6ebb20109b78a39c6fdcefb1692ccd9898..e2c7c65868d78be6d6d5b8f8b332a6461edc954d 100644
--- a/media/mojo/services/mojo_cdm_service.h
+++ b/media/mojo/services/mojo_cdm_service.h
@@ -24,9 +24,9 @@ namespace media {
 
 class CdmFactory;
 
-// A interfaces::ContentDecryptionModule implementation backed by a
+// A mojom::ContentDecryptionModule implementation backed by a
 // media::MediaKeys.
-class MojoCdmService : public interfaces::ContentDecryptionModule {
+class MojoCdmService : public mojom::ContentDecryptionModule {
  public:
   // Get the CDM associated with |cdm_id|, which is unique per process.
   // Can be called on any thread. The returned CDM is not guaranteed to be
@@ -42,43 +42,39 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
   MojoCdmService(
       base::WeakPtr<MojoCdmServiceContext> context,
       CdmFactory* cdm_factory,
-      mojo::InterfaceRequest<interfaces::ContentDecryptionModule> request);
+      mojo::InterfaceRequest<mojom::ContentDecryptionModule> request);
 
   ~MojoCdmService() final;
 
-  // interfaces::ContentDecryptionModule implementation.
-  void SetClient(interfaces::ContentDecryptionModuleClientPtr client) final;
+  // mojom::ContentDecryptionModule implementation.
+  void SetClient(mojom::ContentDecryptionModuleClientPtr client) final;
   void Initialize(const mojo::String& key_system,
                   const mojo::String& security_origin,
-                  interfaces::CdmConfigPtr cdm_config,
+                  mojom::CdmConfigPtr cdm_config,
                   const InitializeCallback& callback) final;
   void SetServerCertificate(
       mojo::Array<uint8_t> certificate_data,
-      const mojo::Callback<void(interfaces::CdmPromiseResultPtr)>& callback)
-      final;
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
   void CreateSessionAndGenerateRequest(
-      interfaces::ContentDecryptionModule::SessionType session_type,
-      interfaces::ContentDecryptionModule::InitDataType init_data_type,
+      mojom::ContentDecryptionModule::SessionType session_type,
+      mojom::ContentDecryptionModule::InitDataType init_data_type,
       mojo::Array<uint8_t> init_data,
-      const mojo::Callback<void(interfaces::CdmPromiseResultPtr, mojo::String)>&
-          callback) final;
-  void LoadSession(
-      interfaces::ContentDecryptionModule::SessionType session_type,
-      const mojo::String& session_id,
-      const mojo::Callback<void(interfaces::CdmPromiseResultPtr, mojo::String)>&
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr, mojo::String)>&
           callback) final;
+  void LoadSession(mojom::ContentDecryptionModule::SessionType session_type,
+                   const mojo::String& session_id,
+                   const mojo::Callback<void(mojom::CdmPromiseResultPtr,
+                                             mojo::String)>& callback) final;
   void UpdateSession(
       const mojo::String& session_id,
       mojo::Array<uint8_t> response,
-      const mojo::Callback<void(interfaces::CdmPromiseResultPtr)>& callback)
-      final;
-  void CloseSession(const mojo::String& session_id,
-                    const mojo::Callback<void(interfaces::CdmPromiseResultPtr)>&
-                        callback) final;
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
+  void CloseSession(
+      const mojo::String& session_id,
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
   void RemoveSession(
       const mojo::String& session_id,
-      const mojo::Callback<void(interfaces::CdmPromiseResultPtr)>& callback)
-      final;
+      const mojo::Callback<void(mojom::CdmPromiseResultPtr)>& callback) final;
 
   // Get CDM to be used by the media pipeline.
   scoped_refptr<MediaKeys> GetCdm();
@@ -113,7 +109,7 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
   // living in the same process.
   static int next_cdm_id_;
 
-  mojo::StrongBinding<interfaces::ContentDecryptionModule> binding_;
+  mojo::StrongBinding<mojom::ContentDecryptionModule> binding_;
   base::WeakPtr<MojoCdmServiceContext> context_;
 
   CdmFactory* cdm_factory_;
@@ -124,7 +120,7 @@ class MojoCdmService : public interfaces::ContentDecryptionModule {
   // Set to a valid CDM ID if the |cdm_| is successfully created.
   int cdm_id_;
 
-  interfaces::ContentDecryptionModuleClientPtr client_;
+  mojom::ContentDecryptionModuleClientPtr client_;
 
   base::WeakPtr<MojoCdmService> weak_this_;
   base::WeakPtrFactory<MojoCdmService> weak_factory_;