Separate MediaKeys interface from Decryptor interface.

webkit/media/webmediaplayer_impl.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/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <string>
 #include <vector>
@@ skipping 993 matching lines @@
   WebInbandTextTrackImpl* const text_track =
     new WebInbandTextTrackImpl(webkind, weblabel, weblanguage,
                                text_track_index_++);
   GetClient()->addTextTrack(text_track);
 
   return scoped_ptr<media::TextTrack>(new TextTrackImpl(text_track));
 }
 
 #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);
 COMPILE_ASSERT_MATCHING_ENUM(ServiceError);
 COMPILE_ASSERT_MATCHING_ENUM(OutputError);
 COMPILE_ASSERT_MATCHING_ENUM(HardwareChangeError);
 COMPILE_ASSERT_MATCHING_ENUM(DomainError);
 #undef COMPILE_ASSERT_MATCHING_ENUM
 
 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),
       WebString::fromUTF8(session_id),
       static_cast<WebKit::WebMediaPlayerClient::MediaKeyErrorCode>(error_code),
       system_code);
 }
 
 void WebMediaPlayerImpl::OnKeyMessage(const std::string& key_system,
                                       const std::string& session_id,
@@ skipping 247 matching lines @@
 
   if (pending_repaint_)
     return;
 
   pending_repaint_ = true;
   main_loop_->PostTask(FROM_HERE, base::Bind(
       &WebMediaPlayerImpl::Repaint, AsWeakPtr()));
 }
 
 }  // namespace webkit_media