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

Side by Side Diff: chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc

Issue 2361203002: Remove calls to MessageLoop::Run/RunUntilIdle. (Closed)
Patch Set: CR jochen #6 Created 4 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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 "chrome/browser/media/webrtc/native_desktop_media_list.h" 5 #include "chrome/browser/media/webrtc/native_desktop_media_list.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 #include <string.h> 9 #include <string.h>
10 #include <vector> 10 #include <vector>
(...skipping 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false); 402 AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);
403 403
404 const int index = kDefaultWindowCount + 1; 404 const int index = kDefaultWindowCount + 1;
405 EXPECT_CALL(observer_, OnSourceAdded(model_.get(), index)) 405 EXPECT_CALL(observer_, OnSourceAdded(model_.get(), index))
406 .WillOnce(DoAll(CheckListSize(model_.get(), index + 1), 406 .WillOnce(DoAll(CheckListSize(model_.get(), index + 1),
407 QuitMessageLoop(message_loop()))); 407 QuitMessageLoop(message_loop())));
408 408
409 AddAuraWindow(); 409 AddAuraWindow();
410 window_capturer_->SetWindowList(window_list_); 410 window_capturer_->SetWindowList(window_list_);
411 411
412 message_loop()->Run(); 412 base::RunLoop().Run();
413 413
414 int native_id = window_list_.back().id; 414 int native_id = window_list_.back().id;
415 EXPECT_EQ(model_->GetSource(index).id.type, DesktopMediaID::TYPE_WINDOW); 415 EXPECT_EQ(model_->GetSource(index).id.type, DesktopMediaID::TYPE_WINDOW);
416 EXPECT_EQ(model_->GetSource(index).id.id, native_id); 416 EXPECT_EQ(model_->GetSource(index).id.id, native_id);
417 EXPECT_EQ(model_->GetSource(index).id.aura_id, 417 EXPECT_EQ(model_->GetSource(index).id.aura_id,
418 native_aura_id_map_[native_id]); 418 native_aura_id_map_[native_id]);
419 } 419 }
420 #endif // defined(ENABLE_AURA_WINDOW_TESTS) 420 #endif // defined(ENABLE_AURA_WINDOW_TESTS)
421 421
422 TEST_F(NativeDesktopMediaListTest, RemoveNativeWindow) { 422 TEST_F(NativeDesktopMediaListTest, RemoveNativeWindow) {
(...skipping 14 matching lines...) Expand all
437 AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false); 437 AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);
438 438
439 int aura_window_start_index = kDefaultWindowCount - kDefaultAuraCount + 1; 439 int aura_window_start_index = kDefaultWindowCount - kDefaultAuraCount + 1;
440 EXPECT_CALL(observer_, OnSourceRemoved(model_.get(), aura_window_start_index)) 440 EXPECT_CALL(observer_, OnSourceRemoved(model_.get(), aura_window_start_index))
441 .WillOnce(DoAll(CheckListSize(model_.get(), kDefaultWindowCount), 441 .WillOnce(DoAll(CheckListSize(model_.get(), kDefaultWindowCount),
442 QuitMessageLoop(message_loop()))); 442 QuitMessageLoop(message_loop())));
443 443
444 RemoveAuraWindow(0); 444 RemoveAuraWindow(0);
445 window_capturer_->SetWindowList(window_list_); 445 window_capturer_->SetWindowList(window_list_);
446 446
447 message_loop()->Run(); 447 base::RunLoop().Run();
448 } 448 }
449 #endif // defined(ENABLE_AURA_WINDOW_TESTS) 449 #endif // defined(ENABLE_AURA_WINDOW_TESTS)
450 450
451 TEST_F(NativeDesktopMediaListTest, RemoveAllWindows) { 451 TEST_F(NativeDesktopMediaListTest, RemoveAllWindows) {
452 AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false); 452 AddWindowsAndVerify(true, kDefaultWindowCount, kDefaultAuraCount, false);
453 453
454 testing::InSequence seq; 454 testing::InSequence seq;
455 for (int i = 0; i < kDefaultWindowCount - 1; i++) { 455 for (int i = 0; i < kDefaultWindowCount - 1; i++) {
456 EXPECT_CALL(observer_, OnSourceRemoved(model_.get(), 1)) 456 EXPECT_CALL(observer_, OnSourceRemoved(model_.get(), 1))
457 .WillOnce(CheckListSize(model_.get(), kDefaultWindowCount - i)); 457 .WillOnce(CheckListSize(model_.get(), kDefaultWindowCount - i));
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
508 QuitMessageLoop(message_loop()))); 508 QuitMessageLoop(message_loop())));
509 509
510 // Swap the two windows. 510 // Swap the two windows.
511 webrtc::WindowCapturer::Window temp = window_list_[0]; 511 webrtc::WindowCapturer::Window temp = window_list_[0];
512 window_list_[0] = window_list_[1]; 512 window_list_[0] = window_list_[1];
513 window_list_[1] = temp; 513 window_list_[1] = temp;
514 window_capturer_->SetWindowList(window_list_); 514 window_capturer_->SetWindowList(window_list_);
515 515
516 base::RunLoop().Run(); 516 base::RunLoop().Run();
517 } 517 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698