| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/message_pump_io_ios.h" | 5 #include "base/message_loop/message_pump_io_ios.h" |
| 6 | 6 |
| 7 #include <unistd.h> | 7 #include <unistd.h> |
| 8 | 8 |
| 9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/message_loop/message_loop.h" | 10 #include "base/message_loop/message_loop.h" |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 ~DeleteWatcher() override { DCHECK(!controller_); } | 114 ~DeleteWatcher() override { DCHECK(!controller_); } |
| 115 | 115 |
| 116 void OnFileCanWriteWithoutBlocking(int /* fd */) override { | 116 void OnFileCanWriteWithoutBlocking(int /* fd */) override { |
| 117 DCHECK(controller_); | 117 DCHECK(controller_); |
| 118 delete controller_; | 118 delete controller_; |
| 119 controller_ = NULL; | 119 controller_ = NULL; |
| 120 } | 120 } |
| 121 }; | 121 }; |
| 122 | 122 |
| 123 TEST_F(MessagePumpIOSForIOTest, DeleteWatcher) { | 123 TEST_F(MessagePumpIOSForIOTest, DeleteWatcher) { |
| 124 scoped_ptr<MessagePumpIOSForIO> pump(new MessagePumpIOSForIO); | 124 std::unique_ptr<MessagePumpIOSForIO> pump(new MessagePumpIOSForIO); |
| 125 MessagePumpIOSForIO::FileDescriptorWatcher* watcher = | 125 MessagePumpIOSForIO::FileDescriptorWatcher* watcher = |
| 126 new MessagePumpIOSForIO::FileDescriptorWatcher; | 126 new MessagePumpIOSForIO::FileDescriptorWatcher; |
| 127 DeleteWatcher delegate(watcher); | 127 DeleteWatcher delegate(watcher); |
| 128 pump->WatchFileDescriptor(pipefds_[1], | 128 pump->WatchFileDescriptor(pipefds_[1], |
| 129 false, MessagePumpIOSForIO::WATCH_READ_WRITE, watcher, &delegate); | 129 false, MessagePumpIOSForIO::WATCH_READ_WRITE, watcher, &delegate); |
| 130 | 130 |
| 131 // Spoof a callback. | 131 // Spoof a callback. |
| 132 HandleFdIOEvent(watcher); | 132 HandleFdIOEvent(watcher); |
| 133 } | 133 } |
| 134 | 134 |
| (...skipping 15 matching lines...) Expand all Loading... |
| 150 false, MessagePumpIOSForIO::WATCH_READ_WRITE, controller_, this); | 150 false, MessagePumpIOSForIO::WATCH_READ_WRITE, controller_, this); |
| 151 } | 151 } |
| 152 } | 152 } |
| 153 | 153 |
| 154 private: | 154 private: |
| 155 MessagePumpIOSForIO* pump_; | 155 MessagePumpIOSForIO* pump_; |
| 156 int fd_to_start_watching_; | 156 int fd_to_start_watching_; |
| 157 }; | 157 }; |
| 158 | 158 |
| 159 TEST_F(MessagePumpIOSForIOTest, StopWatcher) { | 159 TEST_F(MessagePumpIOSForIOTest, StopWatcher) { |
| 160 scoped_ptr<MessagePumpIOSForIO> pump(new MessagePumpIOSForIO); | 160 std::unique_ptr<MessagePumpIOSForIO> pump(new MessagePumpIOSForIO); |
| 161 MessagePumpIOSForIO::FileDescriptorWatcher watcher; | 161 MessagePumpIOSForIO::FileDescriptorWatcher watcher; |
| 162 StopWatcher delegate(&watcher, pump.get()); | 162 StopWatcher delegate(&watcher, pump.get()); |
| 163 pump->WatchFileDescriptor(pipefds_[1], | 163 pump->WatchFileDescriptor(pipefds_[1], |
| 164 false, MessagePumpIOSForIO::WATCH_READ_WRITE, &watcher, &delegate); | 164 false, MessagePumpIOSForIO::WATCH_READ_WRITE, &watcher, &delegate); |
| 165 | 165 |
| 166 // Spoof a callback. | 166 // Spoof a callback. |
| 167 HandleFdIOEvent(&watcher); | 167 HandleFdIOEvent(&watcher); |
| 168 } | 168 } |
| 169 | 169 |
| 170 TEST_F(MessagePumpIOSForIOTest, StopWatcherAndWatchSomethingElse) { | 170 TEST_F(MessagePumpIOSForIOTest, StopWatcherAndWatchSomethingElse) { |
| 171 scoped_ptr<MessagePumpIOSForIO> pump(new MessagePumpIOSForIO); | 171 std::unique_ptr<MessagePumpIOSForIO> pump(new MessagePumpIOSForIO); |
| 172 MessagePumpIOSForIO::FileDescriptorWatcher watcher; | 172 MessagePumpIOSForIO::FileDescriptorWatcher watcher; |
| 173 StopWatcher delegate(&watcher, pump.get(), alternate_pipefds_[1]); | 173 StopWatcher delegate(&watcher, pump.get(), alternate_pipefds_[1]); |
| 174 pump->WatchFileDescriptor(pipefds_[1], | 174 pump->WatchFileDescriptor(pipefds_[1], |
| 175 false, MessagePumpIOSForIO::WATCH_READ_WRITE, &watcher, &delegate); | 175 false, MessagePumpIOSForIO::WATCH_READ_WRITE, &watcher, &delegate); |
| 176 | 176 |
| 177 // Spoof a callback. | 177 // Spoof a callback. |
| 178 HandleFdIOEvent(&watcher); | 178 HandleFdIOEvent(&watcher); |
| 179 } | 179 } |
| 180 | 180 |
| 181 } // namespace | 181 } // namespace |
| 182 | 182 |
| 183 } // namespace base | 183 } // namespace base |
| OLD | NEW |