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

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

Issue 16294003: Update content/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 7 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
diff --git a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
index 304dc2ee485ab0bd95e7094971a11b45f0b8b958..58f291452241aaa7a89d0a698e2fee3695c9d971 100644
--- a/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
+++ b/content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc
@@ -175,7 +175,8 @@ class CaptureTestView : public TestRenderWidgetHostView {
const scoped_refptr<media::VideoFrame>& target,
const base::Callback<void(bool)>& callback) OVERRIDE {
SkColor c = ConvertRgbToYuv(controller_->GetSolidColor());
- media::FillYUV(target, SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
+ media::FillYUV(
+ target.get(), SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
callback.Run(true);
controller_->SignalCopy();
}
@@ -197,9 +198,11 @@ class CaptureTestView : public TestRenderWidgetHostView {
if (subscriber_ && subscriber_->ShouldCaptureFrame(present_time,
&target, &callback)) {
SkColor c = ConvertRgbToYuv(controller_->GetSolidColor());
- media::FillYUV(target, SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
- BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
- base::Bind(callback, present_time, true));
+ media::FillYUV(
+ target.get(), SkColorGetR(c), SkColorGetG(c), SkColorGetB(c));
+ BrowserThread::PostTask(BrowserThread::UI,
+ FROM_HERE,
+ base::Bind(callback, present_time, true));
controller_->SignalCopy();
}
}
@@ -447,7 +450,7 @@ class WebContentsVideoCaptureDeviceTest : public testing::Test {
static_cast<SiteInstanceImpl*>(site_instance.get())->
set_render_process_host_factory(render_process_host_factory_.get());
web_contents_.reset(
- TestWebContents::Create(browser_context_.get(), site_instance));
+ TestWebContents::Create(browser_context_.get(), site_instance.get()));
// This is actually a CaptureTestRenderViewHost.
RenderWidgetHostImpl* rwh =

Powered by Google App Engine
This is Rietveld 408576698