| Index: media/remoting/remoting_cdm.h
|
| diff --git a/media/remoting/remoting_cdm.h b/media/remoting/remoting_cdm.h
|
| index 466dfdf25b419a1953081880a4e2d97fd317023a..5cfb327f496c5b74e0b8e85893ec571ca544b7d0 100644
|
| --- a/media/remoting/remoting_cdm.h
|
| +++ b/media/remoting/remoting_cdm.h
|
| @@ -11,8 +11,11 @@
|
| #include "media/remoting/remoting_cdm_controller.h"
|
|
|
| namespace media {
|
| +namespace remoting {
|
|
|
| // TODO(xjz): Merge this with erickung's implementation.
|
| +// TODO(miu): Execute renaming on all RemotingCdm* classes after erickung's
|
| +// implementation is merged-in.
|
| class RemotingCdm : public ContentDecryptionModule {
|
| public:
|
| RemotingCdm(const std::string& key_system,
|
| @@ -45,7 +48,7 @@ class RemotingCdm : public ContentDecryptionModule {
|
| std::unique_ptr<SimpleCdmPromise> promise) override;
|
| CdmContext* GetCdmContext() override;
|
|
|
| - RemotingSourceImpl* GetRemotingSource();
|
| + SharedSession* session() const { return remoting_cdm_controller_->session(); }
|
|
|
| private:
|
| ~RemotingCdm() override;
|
| @@ -56,6 +59,7 @@ class RemotingCdm : public ContentDecryptionModule {
|
| DISALLOW_COPY_AND_ASSIGN(RemotingCdm);
|
| };
|
|
|
| +} // namespace remoting
|
| } // namespace media
|
|
|
| #endif // MEDIA_REMOTING_REMOTING_CDM_H_
|
|
|