| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "device/bluetooth/test/test_bluetooth_adapter_observer.h" | 5 #include "device/bluetooth/test/test_bluetooth_adapter_observer.h" |
| 6 | 6 |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "device/bluetooth/bluetooth_gatt_characteristic.h" | 8 #include "device/bluetooth/bluetooth_gatt_characteristic.h" |
| 9 #include "device/bluetooth/bluetooth_gatt_descriptor.h" | 9 #include "device/bluetooth/bluetooth_gatt_descriptor.h" |
| 10 #include "device/bluetooth/bluetooth_gatt_service.h" | 10 #include "device/bluetooth/bluetooth_gatt_service.h" |
| (...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 295 EXPECT_EQ( | 295 EXPECT_EQ( |
| 296 descriptor->GetCharacteristic()->GetDescriptor(last_gatt_descriptor_id_), | 296 descriptor->GetCharacteristic()->GetDescriptor(last_gatt_descriptor_id_), |
| 297 descriptor); | 297 descriptor); |
| 298 | 298 |
| 299 QuitMessageLoop(); | 299 QuitMessageLoop(); |
| 300 } | 300 } |
| 301 | 301 |
| 302 void TestBluetoothAdapterObserver::QuitMessageLoop() { | 302 void TestBluetoothAdapterObserver::QuitMessageLoop() { |
| 303 if (base::MessageLoop::current() && | 303 if (base::MessageLoop::current() && |
| 304 base::MessageLoop::current()->is_running()) | 304 base::MessageLoop::current()->is_running()) |
| 305 base::MessageLoop::current()->Quit(); | 305 base::MessageLoop::current()->QuitWhenIdle(); |
| 306 } | 306 } |
| 307 | 307 |
| 308 } // namespace device | 308 } // namespace device |
| OLD | NEW |