Separate MediaKeys interface from Decryptor interface.

webkit/media/crypto/ppapi/clear_key_cdm.cc

 // Copyright (c) 2012 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/crypto/ppapi/clear_key_cdm.h"
 
 #include <algorithm>
 #include <sstream>
 #include <string>
 #include <vector>
@@ skipping 150 matching lines @@
 }
 
 void ClearKeyCdm::Client::KeyAdded(const std::string& key_system,
                                    const std::string& session_id) {
   status_ = kKeyAdded;
   session_id_ = session_id;
 }
 
 void ClearKeyCdm::Client::KeyError(const std::string& key_system,
                                    const std::string& session_id,
-                                   media::Decryptor::KeyError error_code,
+                                   media::MediaKeys::KeyError error_code,
                                    int system_code) {
   status_ = kKeyError;
   session_id_ = session_id;
 }
 
 void ClearKeyCdm::Client::KeyMessage(const std::string& key_system,
                                      const std::string& session_id,
                                      const std::string& message,
                                      const std::string& default_url) {
   status_ = kKeyMessage;
@@ skipping 387 matching lines @@
   int samples_generated = GenerateFakeAudioFramesFromDuration(
       timestamp_in_microseconds - CurrentTimeStampInMicroseconds(),
       audio_frames);
   total_samples_generated_ += samples_generated;
 
   return samples_generated == 0 ? cdm::kNeedMoreData : cdm::kSuccess;
 }
 #endif  // CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER
 
 }  // namespace webkit_media