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

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

Issue 2869733005: Convert some audio code to OnceCallback. (Closed)
Patch Set: Fix BindToCurrentLoop issues Created 3 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/media_stream_dispatcher_host_unittest.cc
diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
index 6e4837718aa1d775d0f161b54f6a9a241d54c446..96c5f6ed957d628a5cd8585c6fe11ff06f641948 100644
--- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
+++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc
@@ -232,10 +232,18 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost,
class MockMediaStreamUIProxy : public FakeMediaStreamUIProxy {
public:
- MOCK_METHOD2(
- OnStarted,
- void(const base::Closure& stop,
- const MediaStreamUIProxy::WindowIdCallback& window_id_callback));
+ void OnStarted(
+ base::OnceClosure stop,
+ MediaStreamUIProxy::WindowIdCallback window_id_callback) override {
+ // gmock cannot handle move-only types:
+ MockOnStarted(
+ base::Bind(&MockMediaStreamUIProxy::RunOnce, base::Passed(&stop)));
+ }
+
+ MOCK_METHOD1(MockOnStarted, void(base::Closure stop));
+
+ private:
+ static void RunOnce(base::OnceClosure cl) { std::move(cl).Run(); }
};
class MediaStreamDispatcherHostTest : public testing::Test {
@@ -323,7 +331,7 @@ class MediaStreamDispatcherHostTest : public testing::Test {
virtual void SetupFakeUI(bool expect_started) {
stream_ui_ = new MockMediaStreamUIProxy();
if (expect_started) {
- EXPECT_CALL(*stream_ui_, OnStarted(_, _));
+ EXPECT_CALL(*stream_ui_, MockOnStarted(_));
}
media_stream_manager_->UseFakeUIForTests(
std::unique_ptr<FakeMediaStreamUIProxy>(stream_ui_));
@@ -830,7 +838,7 @@ TEST_F(MediaStreamDispatcherHostTest, CloseFromUI) {
base::Closure close_callback;
std::unique_ptr<MockMediaStreamUIProxy> stream_ui(
new MockMediaStreamUIProxy());
- EXPECT_CALL(*stream_ui, OnStarted(_, _))
+ EXPECT_CALL(*stream_ui, MockOnStarted(_))
.WillOnce(SaveArg<0>(&close_callback));
media_stream_manager_->UseFakeUIForTests(std::move(stream_ui));

Powered by Google App Engine
This is Rietveld 408576698