| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "base/message_loop.h" | 5 #include "base/message_loop.h" |
| 6 #include "base/platform_thread.h" | 6 #include "base/platform_thread.h" |
| 7 #include "base/waitable_event.h" | 7 #include "base/waitable_event.h" |
| 8 #include "base/waitable_event_watcher.h" | 8 #include "base/waitable_event_watcher.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 | 10 |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 MessageLoop message_loop(message_loop_type); | 104 MessageLoop message_loop(message_loop_type); |
| 105 | 105 |
| 106 QuitDelegate delegate; | 106 QuitDelegate delegate; |
| 107 watcher.StartWatching(&event, &delegate); | 107 watcher.StartWatching(&event, &delegate); |
| 108 } | 108 } |
| 109 } | 109 } |
| 110 } | 110 } |
| 111 | 111 |
| 112 //----------------------------------------------------------------------------- | 112 //----------------------------------------------------------------------------- |
| 113 | 113 |
| 114 TEST(ObjectWatcherTest, BasicSignal) { | 114 TEST(WaitableEventWatcherTest, BasicSignal) { |
| 115 RunTest_BasicSignal(MessageLoop::TYPE_DEFAULT); | 115 RunTest_BasicSignal(MessageLoop::TYPE_DEFAULT); |
| 116 RunTest_BasicSignal(MessageLoop::TYPE_IO); | 116 RunTest_BasicSignal(MessageLoop::TYPE_IO); |
| 117 RunTest_BasicSignal(MessageLoop::TYPE_UI); | 117 RunTest_BasicSignal(MessageLoop::TYPE_UI); |
| 118 } | 118 } |
| 119 | 119 |
| 120 TEST(ObjectWatcherTest, BasicCancel) { | 120 TEST(WaitableEventWatcherTest, BasicCancel) { |
| 121 RunTest_BasicCancel(MessageLoop::TYPE_DEFAULT); | 121 RunTest_BasicCancel(MessageLoop::TYPE_DEFAULT); |
| 122 RunTest_BasicCancel(MessageLoop::TYPE_IO); | 122 RunTest_BasicCancel(MessageLoop::TYPE_IO); |
| 123 RunTest_BasicCancel(MessageLoop::TYPE_UI); | 123 RunTest_BasicCancel(MessageLoop::TYPE_UI); |
| 124 } | 124 } |
| 125 | 125 |
| 126 TEST(ObjectWatcherTest, CancelAfterSet) { | 126 TEST(WaitableEventWatcherTest, CancelAfterSet) { |
| 127 RunTest_CancelAfterSet(MessageLoop::TYPE_DEFAULT); | 127 RunTest_CancelAfterSet(MessageLoop::TYPE_DEFAULT); |
| 128 RunTest_CancelAfterSet(MessageLoop::TYPE_IO); | 128 RunTest_CancelAfterSet(MessageLoop::TYPE_IO); |
| 129 RunTest_CancelAfterSet(MessageLoop::TYPE_UI); | 129 RunTest_CancelAfterSet(MessageLoop::TYPE_UI); |
| 130 } | 130 } |
| 131 | 131 |
| 132 TEST(ObjectWatcherTest, OutlivesMessageLoop) { | 132 TEST(WaitableEventWatcherTest, OutlivesMessageLoop) { |
| 133 RunTest_OutlivesMessageLoop(MessageLoop::TYPE_DEFAULT); | 133 RunTest_OutlivesMessageLoop(MessageLoop::TYPE_DEFAULT); |
| 134 RunTest_OutlivesMessageLoop(MessageLoop::TYPE_IO); | 134 RunTest_OutlivesMessageLoop(MessageLoop::TYPE_IO); |
| 135 RunTest_OutlivesMessageLoop(MessageLoop::TYPE_UI); | 135 RunTest_OutlivesMessageLoop(MessageLoop::TYPE_UI); |
| 136 } | 136 } |
| OLD | NEW |