summaryrefslogtreecommitdiffstats
path: root/device
diff options
context:
space:
mode:
authorki.stfu <ki.stfu@gmail.com>2015-10-12 10:45:55 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-12 17:46:28 +0000
commit55e0b3620524432d77cd3f707acd6ed470c2f1c9 (patch)
tree8231960c6db1b436d22655ee27ceb2506bfa249e /device
parent63b95c0e56fba8908ecdeff90507f3b954dafa1a (diff)
downloadchromium_src-55e0b3620524432d77cd3f707acd6ed470c2f1c9.zip
chromium_src-55e0b3620524432d77cd3f707acd6ed470c2f1c9.tar.gz
chromium_src-55e0b3620524432d77cd3f707acd6ed470c2f1c9.tar.bz2
Don't use base::MessageLoop::{Quit,QuitClosure} in ash/, chromeos/, device/
This patch renames base::MessageLoop::{Quit,QuitClosure} to base::MessageLoop::{QuitWhenIdle,QuitWhenIdleClosure}. BUG=131220 TEST= R=oshima@chromium.org,stevenjb@chromium.org,reillyg@chromium.org Review URL: https://codereview.chromium.org/1396083003 Cr-Commit-Position: refs/heads/master@{#353548}
Diffstat (limited to 'device')
-rw-r--r--device/bluetooth/bluetooth_chromeos_unittest.cc4
-rw-r--r--device/bluetooth/bluetooth_gatt_chromeos_unittest.cc2
-rw-r--r--device/bluetooth/bluetooth_socket_chromeos_unittest.cc16
-rw-r--r--device/bluetooth/test/test_bluetooth_adapter_observer.cc2
4 files changed, 12 insertions, 12 deletions
diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc
index 1f15bbd..49b5b59 100644
--- a/device/bluetooth/bluetooth_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_chromeos_unittest.cc
@@ -157,7 +157,7 @@ class TestPairingDelegate : public BluetoothDevice::PairingDelegate {
void QuitMessageLoop() {
if (base::MessageLoop::current() &&
base::MessageLoop::current()->is_running()) {
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
}
};
@@ -354,7 +354,7 @@ class BluetoothChromeOSTest : public testing::Test {
void QuitMessageLoop() {
if (base::MessageLoop::current() &&
base::MessageLoop::current()->is_running()) {
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
}
};
diff --git a/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc b/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc
index 24eebaf..d93dcc2 100644
--- a/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_gatt_chromeos_unittest.cc
@@ -168,7 +168,7 @@ class BluetoothGattChromeOSTest : public testing::Test {
void QuitMessageLoop() {
if (base::MessageLoop::current() &&
base::MessageLoop::current()->is_running())
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
base::MessageLoop message_loop_;
diff --git a/device/bluetooth/bluetooth_socket_chromeos_unittest.cc b/device/bluetooth/bluetooth_socket_chromeos_unittest.cc
index 747b857..477f3a7 100644
--- a/device/bluetooth/bluetooth_socket_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_socket_chromeos_unittest.cc
@@ -100,7 +100,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
void SuccessCallback() {
++success_callback_count_;
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void ErrorCallback(const std::string& message) {
@@ -108,21 +108,21 @@ class BluetoothSocketChromeOSTest : public testing::Test {
last_message_ = message;
if (message_loop_.is_running())
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void ConnectToServiceSuccessCallback(scoped_refptr<BluetoothSocket> socket) {
++success_callback_count_;
last_socket_ = socket;
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void SendSuccessCallback(int bytes_sent) {
++success_callback_count_;
last_bytes_sent_ = bytes_sent;
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void ReceiveSuccessCallback(int bytes_received,
@@ -131,7 +131,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
last_bytes_received_ = bytes_received;
last_io_buffer_ = io_buffer;
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void ReceiveErrorCallback(BluetoothSocket::ErrorReason reason,
@@ -140,7 +140,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
last_reason_ = reason;
last_message_ = error_message;
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void CreateServiceSuccessCallback(scoped_refptr<BluetoothSocket> socket) {
@@ -148,7 +148,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
last_socket_ = socket;
if (message_loop_.is_running())
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void AcceptSuccessCallback(const BluetoothDevice* device,
@@ -157,7 +157,7 @@ class BluetoothSocketChromeOSTest : public testing::Test {
last_device_ = device;
last_socket_ = socket;
- message_loop_.Quit();
+ message_loop_.QuitWhenIdle();
}
void ImmediateSuccessCallback() {
diff --git a/device/bluetooth/test/test_bluetooth_adapter_observer.cc b/device/bluetooth/test/test_bluetooth_adapter_observer.cc
index 74903a0..811ffb6 100644
--- a/device/bluetooth/test/test_bluetooth_adapter_observer.cc
+++ b/device/bluetooth/test/test_bluetooth_adapter_observer.cc
@@ -302,7 +302,7 @@ void TestBluetoothAdapterObserver::GattDescriptorValueChanged(
void TestBluetoothAdapterObserver::QuitMessageLoop() {
if (base::MessageLoop::current() &&
base::MessageLoop::current()->is_running())
- base::MessageLoop::current()->Quit();
+ base::MessageLoop::current()->QuitWhenIdle();
}
} // namespace device