Rename media::interfaces to media::mojom.

media/mojo/services/mojo_cdm.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 12 matching lines @@
 #include "mojo/public/cpp/bindings/binding.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
 namespace media {
 
 class MojoDecryptor;
 
-// A MediaKeys that proxies to a interfaces::ContentDecryptionModule. That
-// interfaces::ContentDecryptionModule proxies back to the MojoCdm via the
-// interfaces::ContentDecryptionModuleClient interface.
+// A MediaKeys that proxies to a mojom::ContentDecryptionModule. That
+// mojom::ContentDecryptionModule proxies back to the MojoCdm via the
+// mojom::ContentDecryptionModuleClient interface.
 class MojoCdm : public MediaKeys,
                 public CdmContext,
-                public interfaces::ContentDecryptionModuleClient {
+                public mojom::ContentDecryptionModuleClient {
  public:
   static void Create(
       const std::string& key_system,
       const GURL& security_origin,
       const media::CdmConfig& cdm_config,
-      interfaces::ContentDecryptionModulePtr remote_cdm,
+      mojom::ContentDecryptionModulePtr remote_cdm,
       const media::SessionMessageCB& session_message_cb,
       const media::SessionClosedCB& session_closed_cb,
       const media::LegacySessionErrorCB& legacy_session_error_cb,
       const media::SessionKeysChangeCB& session_keys_change_cb,
       const media::SessionExpirationUpdateCB& session_expiration_update_cb,
       const media::CdmCreatedCB& cdm_created_cb);
 
   // MediaKeys implementation.
   void SetServerCertificate(const std::vector<uint8_t>& certificate,
                             std::unique_ptr<SimpleCdmPromise> promise) final;
@@ skipping 13 matching lines @@
   void RemoveSession(const std::string& session_id,
                      std::unique_ptr<SimpleCdmPromise> promise) final;
   CdmContext* GetCdmContext() final;
 
   // CdmContext implementation. Can be called on a different thread.
   // All GetDecryptor() calls must be made on the same thread.
   media::Decryptor* GetDecryptor() final;
   int GetCdmId() const final;
 
  private:
-  MojoCdm(interfaces::ContentDecryptionModulePtr remote_cdm,
+  MojoCdm(mojom::ContentDecryptionModulePtr remote_cdm,
           const SessionMessageCB& session_message_cb,
           const SessionClosedCB& session_closed_cb,
           const LegacySessionErrorCB& legacy_session_error_cb,
           const SessionKeysChangeCB& session_keys_change_cb,
           const SessionExpirationUpdateCB& session_expiration_update_cb);
 
   ~MojoCdm() final;
 
   void InitializeCdm(const std::string& key_system,
                      const GURL& security_origin,
                      const media::CdmConfig& cdm_config,
                      std::unique_ptr<CdmInitializedPromise> promise);
 
   void OnConnectionError();
 
-  // interfaces::ContentDecryptionModuleClient implementation.
+  // mojom::ContentDecryptionModuleClient implementation.
   void OnSessionMessage(const mojo::String& session_id,
-                        interfaces::CdmMessageType message_type,
+                        mojom::CdmMessageType message_type,
                         mojo::Array<uint8_t> message,
                         const mojo::String& legacy_destination_url) final;
   void OnSessionClosed(const mojo::String& session_id) final;
   void OnLegacySessionError(const mojo::String& session_id,
-                            interfaces::CdmException exception,
+                            mojom::CdmException exception,
                             uint32_t system_code,
                             const mojo::String& error_message) final;
   void OnSessionKeysChange(
       const mojo::String& session_id,
       bool has_additional_usable_key,
-      mojo::Array<interfaces::CdmKeyInformationPtr> keys_info) final;
+      mojo::Array<mojom::CdmKeyInformationPtr> keys_info) final;
   void OnSessionExpirationUpdate(const mojo::String& session_id,
                                  double new_expiry_time_sec) final;
 
   // Callback for InitializeCdm.
   // Note: Cannot use OnPromiseResult() below since we need to handle connection
   // error. Also we have extra parameters |cdm_id| and |decryptor|, which aren't
   // needed in CdmInitializedPromise.
-  void OnCdmInitialized(interfaces::CdmPromiseResultPtr result,
+  void OnCdmInitialized(mojom::CdmPromiseResultPtr result,
                         int cdm_id,
-                        interfaces::DecryptorPtr decryptor);
+                        mojom::DecryptorPtr decryptor);
 
   // Callback when new decryption key is available.
   void OnKeyAdded();
 
   // Callbacks to handle CDM promises.
   // We have to inline this method, since MS VS 2013 compiler fails to compile
   // it when this method is not inlined. It fails with error C2244
   // "unable to match function definition to an existing declaration".
   template <typename... T>
   void OnPromiseResult(std::unique_ptr<CdmPromiseTemplate<T...>> promise,
-                       interfaces::CdmPromiseResultPtr result,
+                       mojom::CdmPromiseResultPtr result,
                        typename MojoTypeTrait<T>::MojoType... args) {
     if (result->success)
       promise->resolve(args.template To<T>()...);  // See ISO C++03 14.2/4.
     else
       RejectPromise(std::move(promise), std::move(result));
   }
 
   base::ThreadChecker thread_checker_;
 
-  interfaces::ContentDecryptionModulePtr remote_cdm_;
+  mojom::ContentDecryptionModulePtr remote_cdm_;
   mojo::Binding<ContentDecryptionModuleClient> binding_;
 
   // Protects |cdm_id_|, |decryptor_ptr_|, |decryptor_| and
   // |decryptor_task_runner_| which could be accessed from other threads.
   // See CdmContext implementation above.
   mutable base::Lock lock_;
 
   // CDM ID of the remote CDM. Set after initialization is completed. Must not
   // be invalid if initialization succeeded.
   int cdm_id_;
 
   // The DecryptorPtr exposed by the remote CDM. Set after initialization is
   // completed and cleared after |decryptor_| is created. May be null after
   // initialization if the CDM doesn't support a Decryptor.
-  interfaces::DecryptorPtr decryptor_ptr_;
+  mojom::DecryptorPtr decryptor_ptr_;
 
   // Decryptor based on |decryptor_ptr_|, lazily created in GetDecryptor().
   // Since GetDecryptor() can be called on a different thread, use
   // |decryptor_task_runner_| to bind |decryptor_| to that thread.
   std::unique_ptr<MojoDecryptor> decryptor_;
   scoped_refptr<base::SingleThreadTaskRunner> decryptor_task_runner_;
 
   // Callbacks for firing session events.
   SessionMessageCB session_message_cb_;
   SessionClosedCB session_closed_cb_;
   LegacySessionErrorCB legacy_session_error_cb_;
   SessionKeysChangeCB session_keys_change_cb_;
   SessionExpirationUpdateCB session_expiration_update_cb_;
 
   // Pending promise for InitializeCdm().
   std::unique_ptr<CdmInitializedPromise> pending_init_promise_;
 
   // This must be the last member.
   base::WeakPtrFactory<MojoCdm> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdm);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_H_