content/renderer/media/android/webmediaplayer_android.cc - Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/android/webmediaplayer_android.cc

Issue 18590002: Migrate MediaStream test code from content/shell/renderer/ to content/test/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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

« content/public/renderer/video_frame_provider.h ('K') | « content/renderer/media/android/webmediaplayer_android.h ('k') | content/renderer/media/audio_decoder.h » ('j') | content/shell/renderer/shell_media_stream_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/android/webmediaplayer_android.cc

diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc

index cc8c2e9ff2dd21b36984e80078005505befb0fe0..75199d70e741c0c56a363984c8e6f1618310ca3e 100644

--- a/content/renderer/media/android/webmediaplayer_android.cc

+++ b/content/renderer/media/android/webmediaplayer_android.cc

@@ -14,6 +14,8 @@

#include "content/renderer/media/android/proxy_media_keys.h"

#include "content/renderer/media/android/webmediaplayer_manager_android.h"

#include "content/renderer/media/android/webmediaplayer_proxy_android.h"

+#include "content/renderer/media/webmediaplayer_delegate.h"

+#include "content/renderer/media/webmediaplayer_util.h"

#include "gpu/GLES2/gl2extchromium.h"

#include "media/base/android/media_player_android.h"

#include "media/base/bind_to_loop.h"

@@ -29,12 +31,10 @@

#include "third_party/WebKit/public/web/WebView.h"

#include "webkit/renderer/compositor_bindings/web_layer_impl.h"

#include "webkit/renderer/media/crypto/key_systems.h"

-#include "webkit/renderer/media/webmediaplayer_delegate.h"

-#include "webkit/renderer/media/webmediaplayer_util.h"

#if defined(GOOGLE_TV)

-#include "webkit/renderer/media/media_stream_audio_renderer.h"

-#include "webkit/renderer/media/media_stream_client.h"

+#include "content/public/renderer/media_stream_audio_renderer.h"

+#include "content/public/renderer/media_stream_client.h"

#endif

static const uint32 kGLTextureExternalOES = 0x8D65;

@@ -47,11 +47,6 @@ using WebKit::WebTimeRanges;

using WebKit::WebURL;

using media::MediaPlayerAndroid;

using media::VideoFrame;

-using webkit_media::ConvertSecondsToTimestamp;

-using webkit_media::IsSupportedKeySystem;

-using webkit_media::KeySystemNameForUMA;

-using webkit_media::ProxyDecryptor;

-using webkit_media::WebMediaPlayerDelegate;

namespace {

// Prefix for histograms related to Encrypted Media Extensions.