media: Rename MediaKeys to ContentDecryptionModule

media/remoting/rpc/proto_utils.h

 // Copyright 2016 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_REMOTING_RPC_PROTO_UTILS_H_
 #define MEDIA_REMOTING_RPC_PROTO_UTILS_H_
 
 #include <cstdint>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #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/content_decryption_module.h"

[jrummell, 2016/12/12 22:08:40]

nit: Don't think this is needed.

[xhwang, 2016/12/12 22:32:51]

Done.

 #include "media/base/decoder_buffer.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/eme_constants.h"
-#include "media/base/media_keys.h"
 #include "media/base/pipeline_status.h"
 #include "media/base/video_decoder_config.h"
 #include "media/remoting/remoting_rpc_message.pb.h"
 
 namespace media {
 namespace remoting {
 
 class CdmPromiseResult;
 
 // Utility class to convert data between ::media::DecoderBuffer and byte array.
@@ skipping 91 matching lines @@
   bool success_;
   ::media::CdmPromise::Exception exception_;
   uint32_t system_code_;
   std::string error_message_;
 };
 
 }  // namespace remoting
 }  // namespace media
 
 #endif  // MEDIA_REMOTING_RPC_PROTO_UTILS_H_