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

Unified Diff: content/test/test_video_frame_provider.h

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: rebase 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') | content/test/test_video_frame_provider.cc » ('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/shell/renderer/shell_video_frame_provider.h b/content/test/test_video_frame_provider.h
similarity index 77%
rename from content/shell/renderer/shell_video_frame_provider.h
rename to content/test/test_video_frame_provider.h
index fdcc866c6701347afdafd61a50993b5f7d0956a5..a94e2e3552b883e336586fde3164adcfec6518c9 100644
--- a/content/shell/renderer/shell_video_frame_provider.h
+++ b/content/test/test_video_frame_provider.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_
-#define CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_
+#ifndef CONTENT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
+#define CONTENT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
#include "base/time/time.h"
#include "ui/gfx/size.h"
@@ -20,9 +20,9 @@ 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 ShellVideoFrameProvider : public webkit_media::VideoFrameProvider {
+class TestVideoFrameProvider : public webkit_media::VideoFrameProvider {
public:
- ShellVideoFrameProvider(
+ TestVideoFrameProvider(
const gfx::Size& size,
const base::TimeDelta& frame_duration,
const base::Closure& error_cb,
@@ -35,7 +35,7 @@ class ShellVideoFrameProvider : public webkit_media::VideoFrameProvider {
virtual void Pause() OVERRIDE;
protected:
- virtual ~ShellVideoFrameProvider();
+ virtual ~TestVideoFrameProvider();
private:
enum State {
@@ -55,9 +55,9 @@ class ShellVideoFrameProvider : public webkit_media::VideoFrameProvider {
base::Closure error_cb_;
RepaintCB repaint_cb_;
- DISALLOW_COPY_AND_ASSIGN(ShellVideoFrameProvider);
+ DISALLOW_COPY_AND_ASSIGN(TestVideoFrameProvider);
};
} // namespace content
-#endif // CONTENT_RENDERER_MEDIA_SHELL_VIDEO_FRAME_PROVIDER_H_
+#endif // CONTENT_TEST_TEST_VIDEO_FRAME_PROVIDER_H_
« no previous file with comments | « content/test/test_media_stream_client.cc ('k') | content/test/test_video_frame_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698