| Index: media/remoting/rpc/proto_utils.h
 | 
| diff --git a/media/remoting/rpc/proto_utils.h b/media/remoting/rpc/proto_utils.h
 | 
| index 6bba860aa5b87b4b1aad0dc0dc7f102b458b9f4e..d0d76c8af41f3d2b3110c28a5338a989aa93c963 100644
 | 
| --- a/media/remoting/rpc/proto_utils.h
 | 
| +++ b/media/remoting/rpc/proto_utils.h
 | 
| @@ -14,6 +14,7 @@
 | 
|  #include "media/base/audio_decoder_config.h"
 | 
|  #include "media/base/cdm_config.h"
 | 
|  #include "media/base/cdm_key_information.h"
 | 
| +#include "media/base/cdm_promise.h"
 | 
|  #include "media/base/decoder_buffer.h"
 | 
|  #include "media/base/demuxer_stream.h"
 | 
|  #include "media/base/eme_constants.h"
 | 
| @@ -111,7 +112,7 @@ bool ConvertProtoToCdmPromiseWithCdmIdSessionId(const pb::RpcMessage& message,
 | 
|  class CdmPromiseResult {
 | 
|   public:
 | 
|    CdmPromiseResult();
 | 
| -  CdmPromiseResult(::media::MediaKeys::Exception exception,
 | 
| +  CdmPromiseResult(::media::CdmPromise::Exception exception,
 | 
|                     uint32_t system_code,
 | 
|                     std::string error_message);
 | 
|    CdmPromiseResult(const CdmPromiseResult& other);
 | 
| @@ -120,13 +121,13 @@ class CdmPromiseResult {
 | 
|    static CdmPromiseResult SuccessResult();
 | 
|  
 | 
|    bool success() const { return success_; }
 | 
| -  ::media::MediaKeys::Exception exception() const { return exception_; }
 | 
| +  ::media::CdmPromise::Exception exception() const { return exception_; }
 | 
|    uint32_t system_code() const { return system_code_; }
 | 
|    const std::string& error_message() const { return error_message_; }
 | 
|  
 | 
|   private:
 | 
|    bool success_;
 | 
| -  ::media::MediaKeys::Exception exception_;
 | 
| +  ::media::CdmPromise::Exception exception_;
 | 
|    uint32_t system_code_;
 | 
|    std::string error_message_;
 | 
|  };
 | 
| 
 |