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

Side by Side Diff: content/renderer/media/media_stream_video_capturer_source_unittest.cc

Issue 2211473003: Remove calls to deprecated MessageLoop methods on Windows and Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/renderer/media/media_stream_video_capturer_source.h" 5 #include "content/renderer/media/media_stream_video_capturer_source.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 blink::WebMediaStreamSource::TypeVideo, 302 blink::WebMediaStreamSource::TypeVideo,
303 base::UTF8ToUTF16("dummy_source_name"), 303 base::UTF8ToUTF16("dummy_source_name"),
304 false /* remote */); 304 false /* remote */);
305 webkit_source_.setExtraData(source_); 305 webkit_source_.setExtraData(source_);
306 webkit_source_id_ = webkit_source_.id(); 306 webkit_source_id_ = webkit_source_.id();
307 307
308 InSequence s; 308 InSequence s;
309 EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _)); 309 EXPECT_CALL(mock_delegate(), GetCurrentSupportedFormats(_, _, _, _));
310 EXPECT_CALL(mock_delegate(), StartCapture(_, _, _)); 310 EXPECT_CALL(mock_delegate(), StartCapture(_, _, _));
311 blink::WebMediaStreamTrack track = StartSource(); 311 blink::WebMediaStreamTrack track = StartSource();
312 message_loop_.RunUntilIdle(); 312 base::RunLoop().RunUntilIdle();
313 313
314 OnStarted(true); 314 OnStarted(true);
315 message_loop_.RunUntilIdle(); 315 base::RunLoop().RunUntilIdle();
316 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, 316 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
317 webkit_source_.getReadyState()); 317 webkit_source_.getReadyState());
318 318
319 EXPECT_FALSE(source_stopped_); 319 EXPECT_FALSE(source_stopped_);
320 320
321 EXPECT_CALL(mock_delegate(), StopCapture()); 321 EXPECT_CALL(mock_delegate(), StopCapture());
322 OnStarted(false); 322 OnStarted(false);
323 message_loop_.RunUntilIdle(); 323 base::RunLoop().RunUntilIdle();
324 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, 324 EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
325 webkit_source_.getReadyState()); 325 webkit_source_.getReadyState());
326 // Verify that MediaStreamSource::SourceStoppedCallback has been triggered. 326 // Verify that MediaStreamSource::SourceStoppedCallback has been triggered.
327 EXPECT_TRUE(source_stopped_); 327 EXPECT_TRUE(source_stopped_);
328 } 328 }
329 329
330 class FakeMediaStreamVideoSink : public MediaStreamVideoSink { 330 class FakeMediaStreamVideoSink : public MediaStreamVideoSink {
331 public: 331 public:
332 FakeMediaStreamVideoSink(base::TimeTicks* capture_time, 332 FakeMediaStreamVideoSink(base::TimeTicks* capture_time,
333 media::VideoFrameMetadata* metadata, 333 media::VideoFrameMetadata* metadata,
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 run_loop.Run(); 398 run_loop.Run();
399 fake_sink.DisconnectFromTrack(); 399 fake_sink.DisconnectFromTrack();
400 EXPECT_EQ(reference_capture_time, capture_time); 400 EXPECT_EQ(reference_capture_time, capture_time);
401 double metadata_value; 401 double metadata_value;
402 EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE, 402 EXPECT_TRUE(metadata.GetDouble(media::VideoFrameMetadata::FRAME_RATE,
403 &metadata_value)); 403 &metadata_value));
404 EXPECT_EQ(30.0, metadata_value); 404 EXPECT_EQ(30.0, metadata_value);
405 } 405 }
406 406
407 } // namespace content 407 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698