| 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 85fe8d8713f12b38634f9c2434eb1c449eb52691..ccf6fd53c85d57fc3d6cdaeb1c4e943e511bf477 100644
|
| --- a/content/renderer/media/media_stream_dispatcher_unittest.cc
|
| +++ b/content/renderer/media/media_stream_dispatcher_unittest.cc
|
| @@ -41,7 +41,7 @@ class MockMediaStreamDispatcherEventHandler
|
| int request_id,
|
| const std::string &label,
|
| const StreamDeviceInfoArray& audio_device_array,
|
| - const StreamDeviceInfoArray& video_device_array) OVERRIDE {
|
| + const StreamDeviceInfoArray& video_device_array) override {
|
| request_id_ = request_id;
|
| label_ = label;
|
| if (audio_device_array.size()) {
|
| @@ -56,12 +56,12 @@ class MockMediaStreamDispatcherEventHandler
|
|
|
| virtual void OnStreamGenerationFailed(
|
| int request_id,
|
| - content::MediaStreamRequestResult result) OVERRIDE {
|
| + content::MediaStreamRequestResult result) override {
|
| request_id_ = request_id;
|
| }
|
|
|
| virtual void OnDeviceStopped(const std::string& label,
|
| - const StreamDeviceInfo& device_info) OVERRIDE {
|
| + const StreamDeviceInfo& device_info) override {
|
| device_stopped_label_ = label;
|
| if (IsVideoMediaType(device_info.device.type)) {
|
| EXPECT_TRUE(StreamDeviceInfo::IsEqual(video_device_, device_info));
|
| @@ -73,19 +73,19 @@ class MockMediaStreamDispatcherEventHandler
|
|
|
| virtual void OnDevicesEnumerated(
|
| int request_id,
|
| - const StreamDeviceInfoArray& device_array) OVERRIDE {
|
| + const StreamDeviceInfoArray& device_array) override {
|
| request_id_ = request_id;
|
| }
|
|
|
| virtual void OnDeviceOpened(
|
| int request_id,
|
| const std::string& label,
|
| - const StreamDeviceInfo& video_device) OVERRIDE {
|
| + const StreamDeviceInfo& video_device) override {
|
| request_id_ = request_id;
|
| label_ = label;
|
| }
|
|
|
| - virtual void OnDeviceOpenFailed(int request_id) OVERRIDE {
|
| + virtual void OnDeviceOpenFailed(int request_id) override {
|
| request_id_ = request_id;
|
| }
|
|
|
|
|