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

Unified Diff: content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc

Issue 11339014: Move content\browser\renderer_host\media to content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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: content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
===================================================================
--- content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc (revision 164646)
+++ content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc (working copy)
@@ -15,6 +15,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkColor.h"
+namespace content {
namespace {
const int kTestWidth = 1280;
const int kTestHeight = 720;
@@ -27,10 +28,9 @@
// A stub implementation which returns solid-color bitmaps in calls to
// CopyFromBackingStore(). The unit tests can change the color for successive
// captures.
-class StubRenderWidgetHost : public content::RenderWidgetHostImpl {
+class StubRenderWidgetHost : public RenderWidgetHostImpl {
public:
- StubRenderWidgetHost(content::RenderProcessHost* process,
- int routing_id)
+ StubRenderWidgetHost(RenderProcessHost* process, int routing_id)
: RenderWidgetHostImpl(&delegate_, process, routing_id),
color_(kNothingYet) {}
@@ -55,8 +55,7 @@
}
private:
- class StubRenderWidgetHostDelegate
- : public content::RenderWidgetHostDelegate {
+ class StubRenderWidgetHostDelegate : public RenderWidgetHostDelegate {
public:
StubRenderWidgetHostDelegate() {}
virtual ~StubRenderWidgetHostDelegate() {}
@@ -154,16 +153,14 @@
message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO));
// The CopyFromBackingStore and WebContents tracking occur on the UI thread.
- ui_thread_.reset(
- new content::BrowserThreadImpl(content::BrowserThread::UI));
+ ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI));
ui_thread_->Start();
// And the rest...
- browser_context_.reset(new content::TestBrowserContext());
+ browser_context_.reset(new TestBrowserContext());
source_.reset(new StubRenderWidgetHost(
- new content::MockRenderProcessHost(browser_context_.get()),
- MSG_ROUTING_NONE));
- device_.reset(content::WebContentsVideoCaptureDevice::CreateForTesting(
+ new MockRenderProcessHost(browser_context_.get()), MSG_ROUTING_NONE));
+ device_.reset(WebContentsVideoCaptureDevice::CreateForTesting(
source_.get()));
consumer_.reset(new StubConsumer);
}
@@ -187,8 +184,8 @@
private:
scoped_ptr<MessageLoop> message_loop_;
- scoped_ptr<content::BrowserThreadImpl> ui_thread_;
- scoped_ptr<content::TestBrowserContext> browser_context_;
+ scoped_ptr<BrowserThreadImpl> ui_thread_;
+ scoped_ptr<TestBrowserContext> browser_context_;
scoped_ptr<StubRenderWidgetHost> source_;
scoped_ptr<media::VideoCaptureDevice> device_;
scoped_ptr<StubConsumer> consumer_;
@@ -220,3 +217,5 @@
device()->Allocate(1280, 720, -2, consumer());
EXPECT_FALSE(consumer()->WaitForNextColorOrError(kNotInterested));
}
+
+} // namespace content

Powered by Google App Engine
This is Rietveld 408576698