Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(189)

Unified Diff: media/blink/webmediaplayer_util.cc

Issue 1712903002: Remove prefixed EME. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix layout tests. Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/blink/webmediaplayer_util.cc
diff --git a/media/blink/webmediaplayer_util.cc b/media/blink/webmediaplayer_util.cc
index 7581bc350aa4f91709c5ff06a909213c81c73a2a..8b4f368c2535b9cabc27b43403c6cf1cb23bfb9f 100644
--- a/media/blink/webmediaplayer_util.cc
+++ b/media/blink/webmediaplayer_util.cc
@@ -12,22 +12,10 @@
#include "base/metrics/histogram.h"
#include "media/base/bind_to_current_loop.h"
#include "media/base/media_client.h"
-#include "media/base/media_keys.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::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
-
blink::WebTimeRanges ConvertToWebTimeRanges(
const Ranges<base::TimeDelta>& ranges) {
blink::WebTimeRanges result(ranges.size());

Powered by Google App Engine
This is Rietveld 408576698