Reland r253665 "Rename MediaKeys*Msg to Cdm*Msg."

content/renderer/media/android/proxy_media_keys.cc

 // Copyright 2013 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 "content/renderer/media/android/proxy_media_keys.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 34 matching lines @@
   manager_->InitializeCDM(media_keys_id_, this, uuid, frame_url);
 #endif
 }
 
 bool ProxyMediaKeys::CreateSession(uint32 session_id,
                                    const std::string& content_type,
                                    const uint8* init_data,
                                    int init_data_length) {
   // TODO(xhwang): Move these checks up to blink and DCHECK here.
   // See http://crbug.com/342510
-  MediaKeysHostMsg_CreateSession_Type session_type;
+  CdmHostMsg_CreateSession_Type session_type;
   if (content_type == "audio/mp4" || content_type == "video/mp4") {
     session_type = CREATE_SESSION_TYPE_MP4;
   } else if (content_type == "audio/webm" || content_type == "video/webm") {
     session_type = CREATE_SESSION_TYPE_WEBM;
   } else {
     DLOG(ERROR) << "Unsupported EME CreateSession content type of "
                 << content_type;
     return false;
   }
 
@@ skipping 45 matching lines @@
   session_closed_cb_.Run(session_id);
 }
 
 void ProxyMediaKeys::OnSessionError(uint32 session_id,
                                     media::MediaKeys::KeyError error_code,
                                     int system_code) {
   session_error_cb_.Run(session_id, error_code, system_code);
 }
 
 }  // namespace content