media: Rename MediaKeys to ContentDecryptionModule

media/remoting/rpc/proto_utils.cc

 // 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.
 
 #include "media/remoting/rpc/proto_utils.h"
 
 #include <algorithm>
 
 #include "base/big_endian.h"
 #include "base/logging.h"
@@ skipping 367 matching lines @@
             key_info_msg.system_code()));
     key_information->push_back(std::move(key));
   }
 }
 
 void ConvertCdmPromiseToProto(const CdmPromiseResult& result,
                               pb::CdmPromise* promise_message) {
   promise_message->set_success(result.success());
   if (!result.success()) {
     promise_message->set_exception(
-        ToProtoMediaKeysException(result.exception()).value());
+        ToProtoCdmException(result.exception()).value());
     promise_message->set_system_code(result.system_code());
     promise_message->set_error_message(result.error_message());
   }
 }
 
 void ConvertCdmPromiseWithSessionIdToProto(const CdmPromiseResult& result,
                                            const std::string& session_id,
                                            pb::CdmPromise* promise_message) {
   ConvertCdmPromiseToProto(result, promise_message);
   promise_message->set_session_id(session_id);
@@ skipping 65 matching lines @@
 
 CdmPromiseResult CdmPromiseResult::SuccessResult() {
   CdmPromiseResult result(static_cast<::media::CdmPromise::Exception>(0), 0,
                           "");
   result.success_ = true;
   return result;
 }
 
 }  // namespace remoting
 }  // namespace media