| Index: content/renderer/media/media_stream_dispatcher_unittest.cc
|
| diff --git a/content/renderer/media/media_stream_dispatcher_unittest.cc b/content/renderer/media/media_stream_dispatcher_unittest.cc
|
| index ccf6fd53c85d57fc3d6cdaeb1c4e943e511bf477..32acc8825446f4ceecbf5d4b7d29cd162da43a0b 100644
|
| --- a/content/renderer/media/media_stream_dispatcher_unittest.cc
|
| +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
|
| @@ -37,9 +37,9 @@ class MockMediaStreamDispatcherEventHandler
|
| MockMediaStreamDispatcherEventHandler()
|
| : request_id_(-1) {}
|
|
|
| - virtual void OnStreamGenerated(
|
| + void OnStreamGenerated(
|
| int request_id,
|
| - const std::string &label,
|
| + const std::string& label,
|
| const StreamDeviceInfoArray& audio_device_array,
|
| const StreamDeviceInfoArray& video_device_array) override {
|
| request_id_ = request_id;
|
| @@ -54,14 +54,14 @@ class MockMediaStreamDispatcherEventHandler
|
| }
|
| }
|
|
|
| - virtual void OnStreamGenerationFailed(
|
| + void OnStreamGenerationFailed(
|
| int request_id,
|
| content::MediaStreamRequestResult result) override {
|
| request_id_ = request_id;
|
| }
|
|
|
| - virtual void OnDeviceStopped(const std::string& label,
|
| - const StreamDeviceInfo& device_info) override {
|
| + void OnDeviceStopped(const std::string& label,
|
| + const StreamDeviceInfo& device_info) override {
|
| device_stopped_label_ = label;
|
| if (IsVideoMediaType(device_info.device.type)) {
|
| EXPECT_TRUE(StreamDeviceInfo::IsEqual(video_device_, device_info));
|
| @@ -71,23 +71,19 @@ class MockMediaStreamDispatcherEventHandler
|
| }
|
| }
|
|
|
| - virtual void OnDevicesEnumerated(
|
| - int request_id,
|
| - const StreamDeviceInfoArray& device_array) override {
|
| + void OnDevicesEnumerated(int request_id,
|
| + const StreamDeviceInfoArray& device_array) override {
|
| request_id_ = request_id;
|
| }
|
|
|
| - virtual void OnDeviceOpened(
|
| - int request_id,
|
| - const std::string& label,
|
| - const StreamDeviceInfo& video_device) override {
|
| + void OnDeviceOpened(int request_id,
|
| + const std::string& label,
|
| + const StreamDeviceInfo& video_device) override {
|
| request_id_ = request_id;
|
| label_ = label;
|
| }
|
|
|
| - virtual void OnDeviceOpenFailed(int request_id) override {
|
| - request_id_ = request_id;
|
| - }
|
| + void OnDeviceOpenFailed(int request_id) override { request_id_ = request_id; }
|
|
|
| void ResetStoredParameters() {
|
| request_id_ = -1;
|
|
|