Separate MediaKeys interface from Decryptor interface.

webkit/media/android/media_source_delegate.cc

 // Copyright (c) 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 "webkit/media/android/media_source_delegate.h"
 
 #include "base/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/bind_to_loop.h"
@@ skipping 387 matching lines @@
     proxy_->DemuxerReady(player_id_, params);
 }
 
 void MediaSourceDelegate::OnDemuxerOpened() {
   media_source_->open(new WebMediaSourceClientImpl(
       chunk_demuxer_.get(), base::Bind(&LogMediaSourceError, media_log_)));
 }
 
 void MediaSourceDelegate::OnKeyError(const std::string& key_system,
                                      const std::string& session_id,
-                                     media::Decryptor::KeyError error_code,
+                                     media::MediaKeys::KeyError error_code,
                                      int system_code) {
   client_->keyError(
       WebString::fromUTF8(key_system),
       WebString::fromUTF8(session_id),
       static_cast<WebKit::WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
       system_code);
 }
 
 void MediaSourceDelegate::OnKeyMessage(const std::string& key_system,
                                        const std::string& session_id,
@@ skipping 40 matching lines @@
 void MediaSourceDelegate::OnDecryptorReady(media::Decryptor* decryptor) {}
 
 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(
     media::TextKind kind,
     const std::string& label,
     const std::string& language) {
   return scoped_ptr<media::TextTrack>();
 }
 
 }  // namespace webkit_media