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

Side by Side Diff: content/browser/media/capture/desktop_capture_device_unittest.cc

Issue 629963002: Replacing the OVERRIDE with override and FINAL with final in content/browser/media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/media/capture/desktop_capture_device.h" 5 #include "content/browser/media/capture/desktop_capture_device.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/synchronization/waitable_event.h" 10 #include "base/synchronization/waitable_event.h"
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 frame_index_(0), 90 frame_index_(0),
91 generate_inverted_frames_(false) { 91 generate_inverted_frames_(false) {
92 } 92 }
93 virtual ~FakeScreenCapturer() {} 93 virtual ~FakeScreenCapturer() {}
94 94
95 void set_generate_inverted_frames(bool generate_inverted_frames) { 95 void set_generate_inverted_frames(bool generate_inverted_frames) {
96 generate_inverted_frames_ = generate_inverted_frames; 96 generate_inverted_frames_ = generate_inverted_frames;
97 } 97 }
98 98
99 // VideoFrameCapturer interface. 99 // VideoFrameCapturer interface.
100 virtual void Start(Callback* callback) OVERRIDE { 100 virtual void Start(Callback* callback) override {
101 callback_ = callback; 101 callback_ = callback;
102 } 102 }
103 103
104 virtual void Capture(const webrtc::DesktopRegion& region) OVERRIDE { 104 virtual void Capture(const webrtc::DesktopRegion& region) override {
105 webrtc::DesktopSize size; 105 webrtc::DesktopSize size;
106 if (frame_index_ % 2 == 0) { 106 if (frame_index_ % 2 == 0) {
107 size = webrtc::DesktopSize(kTestFrameWidth1, kTestFrameHeight1); 107 size = webrtc::DesktopSize(kTestFrameWidth1, kTestFrameHeight1);
108 } else { 108 } else {
109 size = webrtc::DesktopSize(kTestFrameWidth2, kTestFrameHeight2); 109 size = webrtc::DesktopSize(kTestFrameWidth2, kTestFrameHeight2);
110 } 110 }
111 frame_index_++; 111 frame_index_++;
112 112
113 webrtc::DesktopFrame* frame = new webrtc::BasicDesktopFrame(size); 113 webrtc::DesktopFrame* frame = new webrtc::BasicDesktopFrame(size);
114 if (generate_inverted_frames_) 114 if (generate_inverted_frames_)
115 frame = new InvertedDesktopFrame(frame); 115 frame = new InvertedDesktopFrame(frame);
116 callback_->OnCaptureCompleted(frame); 116 callback_->OnCaptureCompleted(frame);
117 } 117 }
118 118
119 virtual void SetMouseShapeObserver( 119 virtual void SetMouseShapeObserver(
120 MouseShapeObserver* mouse_shape_observer) OVERRIDE { 120 MouseShapeObserver* mouse_shape_observer) override {
121 } 121 }
122 122
123 virtual bool GetScreenList(ScreenList* screens) OVERRIDE { 123 virtual bool GetScreenList(ScreenList* screens) override {
124 return false; 124 return false;
125 } 125 }
126 126
127 virtual bool SelectScreen(webrtc::ScreenId id) OVERRIDE { 127 virtual bool SelectScreen(webrtc::ScreenId id) override {
128 return false; 128 return false;
129 } 129 }
130 130
131 private: 131 private:
132 Callback* callback_; 132 Callback* callback_;
133 int frame_index_; 133 int frame_index_;
134 bool generate_inverted_frames_; 134 bool generate_inverted_frames_;
135 }; 135 };
136 136
137 } // namespace 137 } // namespace
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 266
267 capture_device_->StopAndDeAllocate(); 267 capture_device_->StopAndDeAllocate();
268 268
269 EXPECT_EQ(kTestFrameWidth1, format.frame_size.width()); 269 EXPECT_EQ(kTestFrameWidth1, format.frame_size.width());
270 EXPECT_EQ(kTestFrameHeight1, format.frame_size.height()); 270 EXPECT_EQ(kTestFrameHeight1, format.frame_size.height());
271 EXPECT_EQ(kFrameRate, format.frame_rate); 271 EXPECT_EQ(kFrameRate, format.frame_rate);
272 EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format); 272 EXPECT_EQ(media::PIXEL_FORMAT_ARGB, format.pixel_format);
273 } 273 }
274 274
275 } // namespace content 275 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698