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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluez/bluetooth_socket_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc ('k') | extensions/browser/api/declarative/rules_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc
diff --git a/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc b/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc
index 75fdb431e44c2c5ded934df62fe1e3553facc45f..ee4d8145be1f4a6a88505918291d050585af6f30 100644
--- a/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc
+++ b/device/bluetooth/bluez/bluetooth_socket_bluez_unittest.cc
@@ -9,6 +9,7 @@
#include "base/bind.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
+#include "base/run_loop.h"
#include "device/bluetooth/bluetooth_adapter.h"
#include "device/bluetooth/bluetooth_adapter_factory.h"
#include "device/bluetooth/bluetooth_device.h"
@@ -82,7 +83,7 @@ class BluetoothSocketBlueZTest : public testing::Test {
device::BluetoothAdapterFactory::GetAdapter(base::Bind(
&BluetoothSocketBlueZTest::AdapterCallback, base::Unretained(this)));
- base::MessageLoop::current()->Run();
+ base::RunLoop().Run();
ASSERT_TRUE(adapter_.get() != nullptr);
ASSERT_TRUE(adapter_->IsInitialized());
@@ -200,7 +201,7 @@ TEST_F(BluetoothSocketBlueZTest, Connect) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -221,7 +222,7 @@ TEST_F(BluetoothSocketBlueZTest, Connect) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -237,7 +238,7 @@ TEST_F(BluetoothSocketBlueZTest, Connect) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ReceiveErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -262,7 +263,7 @@ TEST_F(BluetoothSocketBlueZTest, Connect) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ReceiveErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(0U, success_callback_count_);
EXPECT_EQ(1U, error_callback_count_);
@@ -281,7 +282,7 @@ TEST_F(BluetoothSocketBlueZTest, Connect) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(0U, success_callback_count_);
EXPECT_EQ(1U, error_callback_count_);
@@ -294,7 +295,7 @@ TEST_F(BluetoothSocketBlueZTest, Connect) {
socket->Disconnect(base::Bind(&BluetoothSocketBlueZTest::SuccessCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
}
@@ -307,7 +308,7 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -336,7 +337,7 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
bluez::FakeBluetoothProfileManagerClient::kRfcommUuid,
base::Bind(&base::DoNothing), base::Bind(&DoNothingDBusErrorCallback));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
server_socket->Accept(
base::Bind(&BluetoothSocketBlueZTest::AcceptSuccessCallback,
@@ -344,7 +345,7 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -360,7 +361,7 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
client_socket->Disconnect(base::Bind(
&BluetoothSocketBlueZTest::SuccessCallback, base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
client_socket = nullptr;
@@ -375,14 +376,14 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
fake_bluetooth_device_client->ConnectProfile(
static_cast<BluetoothDeviceBlueZ*>(device)->object_path(),
bluez::FakeBluetoothProfileManagerClient::kRfcommUuid,
base::Bind(&base::DoNothing), base::Bind(&DoNothingDBusErrorCallback));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -398,7 +399,7 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
client_socket->Disconnect(base::Bind(
&BluetoothSocketBlueZTest::SuccessCallback, base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
client_socket = nullptr;
@@ -410,7 +411,7 @@ TEST_F(BluetoothSocketBlueZTest, Listen) {
base::Bind(&BluetoothSocketBlueZTest::ImmediateSuccessCallback,
base::Unretained(this)));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1U, success_callback_count_);
}
@@ -430,7 +431,7 @@ TEST_F(BluetoothSocketBlueZTest, ListenBeforeAdapterStart) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -456,7 +457,7 @@ TEST_F(BluetoothSocketBlueZTest, ListenBeforeAdapterStart) {
// Make the adapter visible. This should register a profile.
fake_bluetooth_adapter_client->SetVisible(true);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
profile_service_provider =
fake_bluetooth_profile_manager_client->GetProfileServiceProvider(
@@ -468,7 +469,7 @@ TEST_F(BluetoothSocketBlueZTest, ListenBeforeAdapterStart) {
base::Bind(&BluetoothSocketBlueZTest::ImmediateSuccessCallback,
base::Unretained(this)));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1U, success_callback_count_);
}
@@ -486,7 +487,7 @@ TEST_F(BluetoothSocketBlueZTest, ListenAcrossAdapterRestart) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -513,12 +514,12 @@ TEST_F(BluetoothSocketBlueZTest, ListenAcrossAdapterRestart) {
// the profile since this doesn't happen automatically.
fake_bluetooth_adapter_client->SetVisible(false);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
// Then make the adapter visible again. This should re-register the profile.
fake_bluetooth_adapter_client->SetVisible(true);
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
profile_service_provider =
fake_bluetooth_profile_manager_client->GetProfileServiceProvider(
@@ -530,7 +531,7 @@ TEST_F(BluetoothSocketBlueZTest, ListenAcrossAdapterRestart) {
base::Bind(&BluetoothSocketBlueZTest::ImmediateSuccessCallback,
base::Unretained(this)));
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1U, success_callback_count_);
}
@@ -546,7 +547,7 @@ TEST_F(BluetoothSocketBlueZTest, PairedConnectFails) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(0U, success_callback_count_);
EXPECT_EQ(1U, error_callback_count_);
@@ -558,7 +559,7 @@ TEST_F(BluetoothSocketBlueZTest, PairedConnectFails) {
base::Unretained(this)),
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(0U, success_callback_count_);
EXPECT_EQ(2U, error_callback_count_);
@@ -574,7 +575,7 @@ TEST_F(BluetoothSocketBlueZTest, SocketListenTwice) {
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(0U, error_callback_count_);
@@ -594,7 +595,7 @@ TEST_F(BluetoothSocketBlueZTest, SocketListenTwice) {
server_socket = nullptr;
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(1U, success_callback_count_);
EXPECT_EQ(1U, error_callback_count_);
@@ -607,7 +608,7 @@ TEST_F(BluetoothSocketBlueZTest, SocketListenTwice) {
base::Bind(&BluetoothSocketBlueZTest::ErrorCallback,
base::Unretained(this)));
- message_loop_.Run();
+ base::RunLoop().Run();
EXPECT_EQ(2U, success_callback_count_);
EXPECT_EQ(1U, error_callback_count_);
@@ -626,7 +627,7 @@ TEST_F(BluetoothSocketBlueZTest, SocketListenTwice) {
server_socket = nullptr;
- message_loop_.RunUntilIdle();
+ base::RunLoop().RunUntilIdle();
EXPECT_EQ(2U, success_callback_count_);
EXPECT_EQ(2U, error_callback_count_);
« no previous file with comments | « device/bluetooth/bluez/bluetooth_gatt_bluez_unittest.cc ('k') | extensions/browser/api/declarative/rules_registry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698