Eliminate MediaPlayer & MediaPlayerClient abstractions

media/blink/webmediaplayer_util.cc

Index: media/blink/webmediaplayer_util.cc
diff --git a/media/blink/webmediaplayer_util.cc b/media/blink/webmediaplayer_util.cc
index c5764349645d728b60e499946abc2eb27518bf63..840ee786ad58168032d2f08006846009104de10b 100644
--- a/media/blink/webmediaplayer_util.cc
+++ b/media/blink/webmediaplayer_util.cc
@@ -8,17 +8,18 @@
 
 #include "base/metrics/histogram.h"
 #include "media/base/media_keys.h"
-#include "third_party/WebKit/public/platform/WebMediaPlayerClient.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayer.h"
+#include "third_party/WebKit/public/platform/WebMediaPlayerEncryptedMediaClient.h"
 
 namespace media {
 
 // Compile asserts shared by all platforms.
 
-#define STATIC_ASSERT_MATCHING_ENUM(name) \
-  static_assert( \
-  static_cast<int>(blink::WebMediaPlayerClient::MediaKeyErrorCode ## name) == \
-  static_cast<int>(MediaKeys::k ## name ## Error), \
-  "mismatching enum values: " #name)
+#define STATIC_ASSERT_MATCHING_ENUM(name)                                    \
+  static_assert(static_cast<int>(blink::WebMediaPlayerEncryptedMediaClient:: \
+                                     MediaKeyErrorCode##name) ==             \
+                    static_cast<int>(MediaKeys::k##name##Error),             \
+                "mismatching enum values: " #name)
 STATIC_ASSERT_MATCHING_ENUM(Unknown);
 STATIC_ASSERT_MATCHING_ENUM(Client);
 #undef STATIC_ASSERT_MATCHING_ENUM