Commit 77fc883d authored by Chris Mumford's avatar Chris Mumford Committed by Commit Bot

[media] Switched from base::Closure to Once/Repeating.

Used OnceClosure except in MockVideoCaptureImplManager where
CreateVideoCaptureImplForTesting could be called multiple times.

Bug: 1007835
Change-Id: I088bec2a050d729fbc2c9b22825d9236c61c721d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1949042Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Commit-Queue: Chris Mumford <cmumford@google.com>
Cr-Commit-Position: refs/heads/master@{#721492}
parent 5a2dde3e
......@@ -70,10 +70,10 @@ class FakeMediaStreamVideoSink : public MediaStreamVideoSink {
public:
FakeMediaStreamVideoSink(base::TimeTicks* capture_time,
media::VideoFrameMetadata* metadata,
base::Closure got_frame_cb)
base::OnceClosure got_frame_cb)
: capture_time_(capture_time),
metadata_(metadata),
got_frame_cb_(got_frame_cb) {}
got_frame_cb_(std::move(got_frame_cb)) {}
void ConnectToTrack(const WebMediaStreamTrack& track) {
MediaStreamVideoSink::ConnectToTrack(
......@@ -97,7 +97,7 @@ class FakeMediaStreamVideoSink : public MediaStreamVideoSink {
private:
base::TimeTicks* const capture_time_;
media::VideoFrameMetadata* const metadata_;
base::Closure got_frame_cb_;
base::OnceClosure got_frame_cb_;
};
} // namespace
......
......@@ -52,12 +52,12 @@ class MockVideoCaptureImpl : public VideoCaptureImpl,
public:
MockVideoCaptureImpl(const media::VideoCaptureSessionId& session_id,
PauseResumeCallback* pause_callback,
base::Closure destruct_callback)
base::OnceClosure destruct_callback)
: VideoCaptureImpl(session_id),
pause_callback_(pause_callback),
destruct_callback_(destruct_callback) {}
destruct_callback_(std::move(destruct_callback)) {}
~MockVideoCaptureImpl() override { destruct_callback_.Run(); }
~MockVideoCaptureImpl() override { std::move(destruct_callback_).Run(); }
private:
void Start(const base::UnguessableToken& device_id,
......@@ -105,7 +105,7 @@ class MockVideoCaptureImpl : public VideoCaptureImpl,
MOCK_METHOD2(OnLog, void(const base::UnguessableToken&, const String&));
PauseResumeCallback* const pause_callback_;
const base::Closure destruct_callback_;
base::OnceClosure destruct_callback_;
DISALLOW_COPY_AND_ASSIGN(MockVideoCaptureImpl);
};
......@@ -113,7 +113,7 @@ class MockVideoCaptureImpl : public VideoCaptureImpl,
class MockVideoCaptureImplManager : public WebVideoCaptureImplManager {
public:
MockVideoCaptureImplManager(PauseResumeCallback* pause_callback,
base::Closure stop_capture_callback)
base::RepeatingClosure stop_capture_callback)
: pause_callback_(pause_callback),
stop_capture_callback_(stop_capture_callback) {}
~MockVideoCaptureImplManager() override {}
......@@ -128,7 +128,7 @@ class MockVideoCaptureImplManager : public WebVideoCaptureImplManager {
}
PauseResumeCallback* const pause_callback_;
const base::Closure stop_capture_callback_;
const base::RepeatingClosure stop_capture_callback_;
DISALLOW_COPY_AND_ASSIGN(MockVideoCaptureImplManager);
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment