| OLD | NEW |
| 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/desktop_media_list_ash.h" | 5 #include "chrome/browser/media/desktop_media_list_ash.h" |
| 6 | 6 |
| 7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
| 8 #include "base/location.h" | 8 #include "base/location.h" |
| 9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
| 10 #include "base/single_thread_task_runner.h" | 10 #include "base/single_thread_task_runner.h" |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 42 } | 42 } |
| 43 | 43 |
| 44 protected: | 44 protected: |
| 45 MockDesktopMediaListObserver observer_; | 45 MockDesktopMediaListObserver observer_; |
| 46 scoped_ptr<DesktopMediaListAsh> list_; | 46 scoped_ptr<DesktopMediaListAsh> list_; |
| 47 DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAshTest); | 47 DISALLOW_COPY_AND_ASSIGN(DesktopMediaListAshTest); |
| 48 }; | 48 }; |
| 49 | 49 |
| 50 ACTION(QuitMessageLoop) { | 50 ACTION(QuitMessageLoop) { |
| 51 base::ThreadTaskRunnerHandle::Get()->PostTask( | 51 base::ThreadTaskRunnerHandle::Get()->PostTask( |
| 52 FROM_HERE, base::MessageLoop::QuitClosure()); | 52 FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); |
| 53 } | 53 } |
| 54 | 54 |
| 55 TEST_F(DesktopMediaListAshTest, Screen) { | 55 TEST_F(DesktopMediaListAshTest, Screen) { |
| 56 CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS); | 56 CreateList(DesktopMediaListAsh::SCREENS | DesktopMediaListAsh::WINDOWS); |
| 57 | 57 |
| 58 EXPECT_CALL(observer_, OnSourceAdded(0)); | 58 EXPECT_CALL(observer_, OnSourceAdded(0)); |
| 59 EXPECT_CALL(observer_, OnSourceThumbnailChanged(0)) | 59 EXPECT_CALL(observer_, OnSourceThumbnailChanged(0)) |
| 60 .WillOnce(QuitMessageLoop()) | 60 .WillOnce(QuitMessageLoop()) |
| 61 .WillRepeatedly(DoDefault()); | 61 .WillRepeatedly(DoDefault()); |
| 62 list_->StartUpdating(&observer_); | 62 list_->StartUpdating(&observer_); |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 .WillOnce(QuitMessageLoop()) | 115 .WillOnce(QuitMessageLoop()) |
| 116 .WillRepeatedly(DoDefault()); | 116 .WillRepeatedly(DoDefault()); |
| 117 EXPECT_CALL(observer_, OnSourceRemoved(0)) | 117 EXPECT_CALL(observer_, OnSourceRemoved(0)) |
| 118 .WillOnce(QuitMessageLoop()); | 118 .WillOnce(QuitMessageLoop()); |
| 119 | 119 |
| 120 list_->StartUpdating(&observer_); | 120 list_->StartUpdating(&observer_); |
| 121 base::MessageLoop::current()->Run(); | 121 base::MessageLoop::current()->Run(); |
| 122 window.reset(); | 122 window.reset(); |
| 123 base::MessageLoop::current()->Run(); | 123 base::MessageLoop::current()->Run(); |
| 124 } | 124 } |
| OLD | NEW |