content/renderer/media/media_stream_video_capture_source_unittest.cc - Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/media/media_stream_video_capture_source_unittest.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 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/renderer/media/android/webmediaplayer_android.cc ('k') | content/renderer/media/media_stream_video_capturer_source.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/media/media_stream_video_capture_source_unittest.cc

diff --git a/content/renderer/media/media_stream_video_capture_source_unittest.cc b/content/renderer/media/media_stream_video_capture_source_unittest.cc

index ceec81390e20f360edc1553f80c022e9ff6445f3..eac563b9eace3353d49b67a521961252b2fb8355 100644

--- a/content/renderer/media/media_stream_video_capture_source_unittest.cc

+++ b/content/renderer/media/media_stream_video_capture_source_unittest.cc

@@ -3,6 +3,7 @@

// found in the LICENSE file.

#include "base/bind.h"

+#include "base/bind_to_current_loop.h"

#include "base/callback_helpers.h"

#include "base/message_loop/message_loop.h"

#include "base/run_loop.h"

@@ -12,7 +13,6 @@

#include "content/renderer/media/media_stream_video_capturer_source.h"

#include "content/renderer/media/media_stream_video_track.h"

#include "content/renderer/media/mock_media_constraint_factory.h"

-#include "media/base/bind_to_current_loop.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/WebKit/public/web/WebHeap.h"

@@ -223,7 +223,7 @@ TEST_F(MediaStreamVideoCapturerSourceTest, CaptureTimeAndMetadataPlumbing) {

FakeMediaStreamVideoSink fake_sink(

&capture_time,

&metadata,

- media::BindToCurrentLoop(run_loop.QuitClosure()));

+ base::BindToCurrentLoop(run_loop.QuitClosure()));

FakeMediaStreamVideoSink::AddToVideoTrack(

&fake_sink,

base::Bind(&FakeMediaStreamVideoSink::OnVideoFrame,