Separate MediaKeys interface from Decryptor interface.

webkit/media/webmediaplayer_impl.cc

Index: webkit/media/webmediaplayer_impl.cc
diff --git a/webkit/media/webmediaplayer_impl.cc b/webkit/media/webmediaplayer_impl.cc
index 140a1e9695c842481cfb232ccde7e0320429653d..dfa1190caa99d1ed41f0de598a1dfd1e485aae89 100644
--- a/webkit/media/webmediaplayer_impl.cc
+++ b/webkit/media/webmediaplayer_impl.cc
@@ -1011,7 +1011,7 @@ WebMediaPlayerImpl::OnTextTrack(media::TextKind kind,
 
 #define COMPILE_ASSERT_MATCHING_ENUM(name) \
   COMPILE_ASSERT(static_cast<int>(WebKit::WebMediaPlayerClient::name) == \
-                 static_cast<int>(media::Decryptor::k ## name), \
+                 static_cast<int>(media::MediaKeys::k ## name), \
                  mismatching_enums)
 COMPILE_ASSERT_MATCHING_ENUM(UnknownError);
 COMPILE_ASSERT_MATCHING_ENUM(ClientError);
@@ -1023,12 +1023,12 @@ COMPILE_ASSERT_MATCHING_ENUM(DomainError);
 
 void WebMediaPlayerImpl::OnKeyError(const std::string& key_system,
                                     const std::string& session_id,
-                                    media::Decryptor::KeyError error_code,
+                                    media::MediaKeys::KeyError error_code,
                                     int system_code) {
   DCHECK(main_loop_->BelongsToCurrentThread());
 
   EmeUMAHistogramEnumeration(
-      key_system, "KeyError", error_code, media::Decryptor::kMaxKeyError);
+      key_system, "KeyError", error_code, media::MediaKeys::kMaxKeyError);
 
   GetClient()->keyError(
       WebString::fromUTF8(key_system),