| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 std::unique_ptr<DesktopFrame> frame; | 215 std::unique_ptr<DesktopFrame> frame; |
| 216 EXPECT_CALL(callback_, | 216 EXPECT_CALL(callback_, |
| 217 OnCaptureResultPtr(DesktopCapturer::Result::SUCCESS, _)) | 217 OnCaptureResultPtr(DesktopCapturer::Result::SUCCESS, _)) |
| 218 .WillOnce(SaveUniquePtrArg(&frame)); | 218 .WillOnce(SaveUniquePtrArg(&frame)); |
| 219 capturer->CaptureFrame(); | 219 capturer->CaptureFrame(); |
| 220 EXPECT_TRUE(frame); | 220 EXPECT_TRUE(frame); |
| 221 return frame; | 221 return frame; |
| 222 } | 222 } |
| 223 }; | 223 }; |
| 224 | 224 |
| 225 TEST_F(ScreenCapturerIntegrationTest, CaptureUpdatedRegion) { | 225 // Disabled because it's flaky. |
| 226 // https://bugs.chromium.org/p/webrtc/issues/detail?id=6666 |
| 227 TEST_F(ScreenCapturerIntegrationTest, DISABLED_CaptureUpdatedRegion) { |
| 226 TestCaptureUpdatedRegion(); | 228 TestCaptureUpdatedRegion(); |
| 227 } | 229 } |
| 228 | 230 |
| 229 TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) { | 231 TEST_F(ScreenCapturerIntegrationTest, TwoCapturers) { |
| 230 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); | 232 std::unique_ptr<DesktopCapturer> capturer2 = std::move(capturer_); |
| 231 SetUp(); | 233 SetUp(); |
| 232 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); | 234 TestCaptureUpdatedRegion({capturer_.get(), capturer2.get()}); |
| 233 } | 235 } |
| 234 | 236 |
| 235 #if defined(WEBRTC_WIN) | 237 #if defined(WEBRTC_WIN) |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 MaybeCaptureUpdatedRegionWithDirectxCapturer) { | 271 MaybeCaptureUpdatedRegionWithDirectxCapturer) { |
| 270 // Even DirectX capturer is not supported in current system, we should be able | 272 // Even DirectX capturer is not supported in current system, we should be able |
| 271 // to select a usable capturer. | 273 // to select a usable capturer. |
| 272 MaybeCreateDirectxCapturer(); | 274 MaybeCreateDirectxCapturer(); |
| 273 TestCaptureUpdatedRegion(); | 275 TestCaptureUpdatedRegion(); |
| 274 } | 276 } |
| 275 | 277 |
| 276 #endif // defined(WEBRTC_WIN) | 278 #endif // defined(WEBRTC_WIN) |
| 277 | 279 |
| 278 } // namespace webrtc | 280 } // namespace webrtc |
| OLD | NEW |