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

Unified Diff: content/test/test_video_frame_provider.h

Issue 18261007: Migrate webkit/renderer/media/ to content/renderer/media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win64 AGAIN Created 7 years, 5 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
« no previous file with comments | « content/test/test_media_stream_client.cc ('k') | webkit/renderer/media/active_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_video_frame_provider.h
diff --git a/content/test/test_video_frame_provider.h b/content/test/test_video_frame_provider.h
index a94e2e3552b883e336586fde3164adcfec6518c9..a08a3a413eb1b9ee1d131bc130848dab70b45483 100644
--- a/content/test/test_video_frame_provider.h
+++ b/content/test/test_video_frame_provider.h
@@ -6,8 +6,8 @@
#define CONTENT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
#include "base/time/time.h"
+#include "content/renderer/media/video_frame_provider.h"
#include "ui/gfx/size.h"
-#include "webkit/renderer/media/video_frame_provider.h"
namespace base {
class MessageLoopProxy;
@@ -20,7 +20,7 @@ namespace content {
// Since non-black pixel values are required in the layout test, e.g.,
// media/video-capture-canvas.html, this class should generate frame with
// only non-black pixels.
-class TestVideoFrameProvider : public webkit_media::VideoFrameProvider {
+class TestVideoFrameProvider : public VideoFrameProvider {
public:
TestVideoFrameProvider(
const gfx::Size& size,
@@ -28,7 +28,7 @@ class TestVideoFrameProvider : public webkit_media::VideoFrameProvider {
const base::Closure& error_cb,
const RepaintCB& repaint_cb);
- // webkit_media::VideoFrameProvider implementation.
+ // VideoFrameProvider implementation.
virtual void Start() OVERRIDE;
virtual void Stop() OVERRIDE;
virtual void Play() OVERRIDE;
« no previous file with comments | « content/test/test_media_stream_client.cc ('k') | webkit/renderer/media/active_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698