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

Unified Diff: content/test/test_video_frame_provider.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: 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_video_frame_provider.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_video_frame_provider.cc
diff --git a/content/shell/renderer/shell_video_frame_provider.cc b/content/test/test_video_frame_provider.cc
similarity index 69%
rename from content/shell/renderer/shell_video_frame_provider.cc
rename to content/test/test_video_frame_provider.cc
index 8c4d44028a683c6bd45f7f645764052f679b6c2d..d56835900225d25d0d5c2147a537779a870c899b 100644
--- a/content/shell/renderer/shell_video_frame_provider.cc
+++ b/content/test/test_video_frame_provider.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/shell/renderer/shell_video_frame_provider.h"
+#include "content/test/test_video_frame_provider.h"
#include "base/bind.h"
#include "base/location.h"
@@ -11,7 +11,7 @@
namespace content {
-ShellVideoFrameProvider::ShellVideoFrameProvider(
+TestVideoFrameProvider::TestVideoFrameProvider(
const gfx::Size& size,
const base::TimeDelta& frame_duration,
const base::Closure& error_cb,
@@ -24,39 +24,39 @@ ShellVideoFrameProvider::ShellVideoFrameProvider(
repaint_cb_(repaint_cb) {
}
-ShellVideoFrameProvider::~ShellVideoFrameProvider() {}
+TestVideoFrameProvider::~TestVideoFrameProvider() {}
-void ShellVideoFrameProvider::Start() {
- DVLOG(1) << "ShellVideoFrameProvider::Start";
+void TestVideoFrameProvider::Start() {
+ DVLOG(1) << "TestVideoFrameProvider::Start";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
state_ = kStarted;
message_loop_proxy_->PostTask(
FROM_HERE,
- base::Bind(&ShellVideoFrameProvider::GenerateFrame, this));
+ base::Bind(&TestVideoFrameProvider::GenerateFrame, this));
}
-void ShellVideoFrameProvider::Stop() {
- DVLOG(1) << "ShellVideoFrameProvider::Stop";
+void TestVideoFrameProvider::Stop() {
+ DVLOG(1) << "TestVideoFrameProvider::Stop";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
state_ = kStopped;
}
-void ShellVideoFrameProvider::Play() {
- DVLOG(1) << "ShellVideoFrameProvider::Play";
+void TestVideoFrameProvider::Play() {
+ DVLOG(1) << "TestVideoFrameProvider::Play";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
if (state_ == kPaused)
state_ = kStarted;
}
-void ShellVideoFrameProvider::Pause() {
- DVLOG(1) << "ShellVideoFrameProvider::Pause";
+void TestVideoFrameProvider::Pause() {
+ DVLOG(1) << "TestVideoFrameProvider::Pause";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
if (state_ == kStarted)
state_ = kPaused;
}
-void ShellVideoFrameProvider::GenerateFrame() {
- DVLOG(1) << "ShellVideoFrameProvider::GenerateFrame";
+void TestVideoFrameProvider::GenerateFrame() {
+ DVLOG(1) << "TestVideoFrameProvider::GenerateFrame";
DCHECK(message_loop_proxy_->BelongsToCurrentThread());
if (state_ == kStopped)
return;
@@ -76,7 +76,7 @@ void ShellVideoFrameProvider::GenerateFrame() {
current_time_ += frame_duration_;
message_loop_proxy_->PostDelayedTask(
FROM_HERE,
- base::Bind(&ShellVideoFrameProvider::GenerateFrame, this),
+ base::Bind(&TestVideoFrameProvider::GenerateFrame, this),
frame_duration_);
}
« no previous file with comments | « content/test/test_video_frame_provider.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698