Eliminate MediaPlayer & MediaPlayerClient abstractions

media/blink/webmediaplayer_util.cc

 // Copyright 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 "media/blink/webmediaplayer_util.h"
 
 #include <math.h>
 
 #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
 
 base::TimeDelta ConvertSecondsToTimestamp(double seconds) {
   double microseconds = seconds * base::Time::kMicrosecondsPerSecond;
   return base::TimeDelta::FromMicroseconds(
       microseconds > 0 ? microseconds + 0.5 : ceil(microseconds - 0.5));
 }
 
@@ skipping 113 matching lines @@
       return blink::WebEncryptedMediaInitDataType::Keyids;
     case EmeInitDataType::UNKNOWN:
       return blink::WebEncryptedMediaInitDataType::Unknown;
   }
 
   NOTREACHED();
   return blink::WebEncryptedMediaInitDataType::Unknown;
 }
 
 }  // namespace media