| Index: content/browser/media/capture/desktop_capture_device_unittest.cc
|
| diff --git a/content/browser/media/capture/desktop_capture_device_unittest.cc b/content/browser/media/capture/desktop_capture_device_unittest.cc
|
| index 883fdc477e1c4d5cde0bb07a43d06092e395ba11..0388043642fb62fc9721ef3c0b33b76c723d7108 100644
|
| --- a/content/browser/media/capture/desktop_capture_device_unittest.cc
|
| +++ b/content/browser/media/capture/desktop_capture_device_unittest.cc
|
| @@ -74,7 +74,7 @@ class InvertedDesktopFrame : public webrtc::DesktopFrame {
|
| set_capture_time_ms(frame->capture_time_ms());
|
| mutable_updated_region()->Swap(frame->mutable_updated_region());
|
| }
|
| - virtual ~InvertedDesktopFrame() {}
|
| + ~InvertedDesktopFrame() override {}
|
|
|
| private:
|
| scoped_ptr<webrtc::DesktopFrame> original_frame_;
|
| @@ -90,18 +90,16 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer {
|
| frame_index_(0),
|
| generate_inverted_frames_(false) {
|
| }
|
| - virtual ~FakeScreenCapturer() {}
|
| + ~FakeScreenCapturer() override {}
|
|
|
| void set_generate_inverted_frames(bool generate_inverted_frames) {
|
| generate_inverted_frames_ = generate_inverted_frames;
|
| }
|
|
|
| // VideoFrameCapturer interface.
|
| - virtual void Start(Callback* callback) override {
|
| - callback_ = callback;
|
| - }
|
| + void Start(Callback* callback) override { callback_ = callback; }
|
|
|
| - virtual void Capture(const webrtc::DesktopRegion& region) override {
|
| + void Capture(const webrtc::DesktopRegion& region) override {
|
| webrtc::DesktopSize size;
|
| if (frame_index_ % 2 == 0) {
|
| size = webrtc::DesktopSize(kTestFrameWidth1, kTestFrameHeight1);
|
| @@ -116,17 +114,12 @@ class FakeScreenCapturer : public webrtc::ScreenCapturer {
|
| callback_->OnCaptureCompleted(frame);
|
| }
|
|
|
| - virtual void SetMouseShapeObserver(
|
| - MouseShapeObserver* mouse_shape_observer) override {
|
| - }
|
| + void SetMouseShapeObserver(
|
| + MouseShapeObserver* mouse_shape_observer) override {}
|
|
|
| - virtual bool GetScreenList(ScreenList* screens) override {
|
| - return false;
|
| - }
|
| + bool GetScreenList(ScreenList* screens) override { return false; }
|
|
|
| - virtual bool SelectScreen(webrtc::ScreenId id) override {
|
| - return false;
|
| - }
|
| + bool SelectScreen(webrtc::ScreenId id) override { return false; }
|
|
|
| private:
|
| Callback* callback_;
|
|
|