Index: base/message_pump_mac_unittest.cc |
=================================================================== |
--- base/message_pump_mac_unittest.cc (revision 89773) |
+++ base/message_pump_mac_unittest.cc (working copy) |
@@ -2,7 +2,7 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "base/message_pump_libevent.h" |
+#include "base/message_pump_mac.h" |
#include <unistd.h> |
@@ -12,12 +12,12 @@ |
namespace { |
-class MessagePumpLibeventTest : public testing::Test { |
+class MessagePumpCFRunLoopBaseTest : public testing::Test { |
public: |
- MessagePumpLibeventTest() |
+ MessagePumpCFRunLoopBaseTest() |
: ui_loop_(MessageLoop::TYPE_UI), |
- io_thread_("MessagePumpLibeventTestIOThread") {} |
- virtual ~MessagePumpLibeventTest() {} |
+ io_thread_("MessagePumpCFRunLoopBaseTestIOThread") {} |
+ virtual ~MessagePumpCFRunLoopBaseTest() {} |
virtual void SetUp() { |
base::Thread::Options options(MessageLoop::TYPE_IO, 0); |
@@ -33,16 +33,16 @@ |
private: |
MessageLoop ui_loop_; |
base::Thread io_thread_; |
- DISALLOW_COPY_AND_ASSIGN(MessagePumpLibeventTest); |
+ DISALLOW_COPY_AND_ASSIGN(MessagePumpCFRunLoopBaseTest); |
}; |
-// Concrete implementation of base::MessagePumpLibevent::Watcher that does |
+// Concrete implementation of base::MessagePumpCFRunLoopBase::Watcher that does |
// nothing useful. |
-class StupidWatcher : public base::MessagePumpLibevent::Watcher { |
+class StupidWatcher : public base::MessagePumpCFRunLoopBase::Watcher { |
public: |
virtual ~StupidWatcher() {} |
- // base:MessagePumpLibEvent::Watcher interface |
+ // base:MessagePumpCFRunLoopBase::Watcher interface |
virtual void OnFileCanReadWithoutBlocking(int fd) {} |
virtual void OnFileCanWriteWithoutBlocking(int fd) {} |
}; |
@@ -53,8 +53,8 @@ |
// Test to make sure that we catch calling WatchFileDescriptor off of the |
// wrong thread. |
-TEST_F(MessagePumpLibeventTest, TestWatchingFromBadThread) { |
- base::MessagePumpLibevent::FileDescriptorWatcher watcher; |
+TEST_F(MessagePumpCFRunLoopBaseTest, TestWatchingFromBadThread) { |
+ base::MessagePumpCFRunLoopBase::FileDescriptorWatcher watcher; |
StupidWatcher delegate; |
ASSERT_DEBUG_DEATH(io_loop()->WatchFileDescriptor( |