Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Side by Side Diff: device/bluetooth/bluez/bluetooth_advertisement_bluez_unittest.cc

Issue 2211473003: Remove calls to deprecated MessageLoop methods on Windows and Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/bluez/bluetooth_advertisement_bluez.h" 5 #include "device/bluetooth/bluez/bluetooth_advertisement_bluez.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/memory/ptr_util.h" 13 #include "base/memory/ptr_util.h"
14 #include "base/memory/ref_counted.h" 14 #include "base/memory/ref_counted.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/run_loop.h"
16 #include "device/bluetooth/bluetooth_adapter.h" 17 #include "device/bluetooth/bluetooth_adapter.h"
17 #include "device/bluetooth/bluetooth_adapter_factory.h" 18 #include "device/bluetooth/bluetooth_adapter_factory.h"
18 #include "device/bluetooth/bluetooth_advertisement.h" 19 #include "device/bluetooth/bluetooth_advertisement.h"
19 #include "device/bluetooth/dbus/bluez_dbus_manager.h" 20 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
20 #include "device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider .h" 21 #include "device/bluetooth/dbus/fake_bluetooth_le_advertisement_service_provider .h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 23
23 using device::BluetoothAdapter; 24 using device::BluetoothAdapter;
24 using device::BluetoothAdapterFactory; 25 using device::BluetoothAdapterFactory;
25 using device::BluetoothAdvertisement; 26 using device::BluetoothAdvertisement;
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 advertisement_ = nullptr; 76 advertisement_ = nullptr;
76 adapter_ = nullptr; 77 adapter_ = nullptr;
77 bluez::BluezDBusManager::Shutdown(); 78 bluez::BluezDBusManager::Shutdown();
78 } 79 }
79 80
80 // Gets the existing Bluetooth adapter. 81 // Gets the existing Bluetooth adapter.
81 void GetAdapter() { 82 void GetAdapter() {
82 BluetoothAdapterFactory::GetAdapter( 83 BluetoothAdapterFactory::GetAdapter(
83 base::Bind(&BluetoothAdvertisementBlueZTest::GetAdapterCallback, 84 base::Bind(&BluetoothAdvertisementBlueZTest::GetAdapterCallback,
84 base::Unretained(this))); 85 base::Unretained(this)));
85 base::MessageLoop::current()->Run(); 86 base::RunLoop().Run();
86 } 87 }
87 88
88 // Called whenever BluetoothAdapter is retrieved successfully. 89 // Called whenever BluetoothAdapter is retrieved successfully.
89 void GetAdapterCallback(scoped_refptr<BluetoothAdapter> adapter) { 90 void GetAdapterCallback(scoped_refptr<BluetoothAdapter> adapter) {
90 adapter_ = adapter; 91 adapter_ = adapter;
91 ASSERT_NE(adapter_.get(), nullptr); 92 ASSERT_NE(adapter_.get(), nullptr);
92 ASSERT_TRUE(adapter_->IsInitialized()); 93 ASSERT_TRUE(adapter_->IsInitialized());
93 if (base::MessageLoop::current() && 94 if (base::MessageLoop::current() &&
94 base::MessageLoop::current()->is_running()) { 95 base::MessageLoop::current()->is_running()) {
95 base::MessageLoop::current()->QuitWhenIdle(); 96 base::MessageLoop::current()->QuitWhenIdle();
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 TriggerReleased(advertisement); 241 TriggerReleased(advertisement);
241 EXPECT_TRUE(observer_->released()); 242 EXPECT_TRUE(observer_->released());
242 243
243 // Unregistering an advertisement that has been released should give us an 244 // Unregistering an advertisement that has been released should give us an
244 // error. 245 // error.
245 UnregisterAdvertisement(advertisement); 246 UnregisterAdvertisement(advertisement);
246 ExpectError(BluetoothAdvertisement::ERROR_ADVERTISEMENT_DOES_NOT_EXIST); 247 ExpectError(BluetoothAdvertisement::ERROR_ADVERTISEMENT_DOES_NOT_EXIST);
247 } 248 }
248 249
249 } // namespace bluez 250 } // namespace bluez
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698