diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 22:24:33 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 22:24:33 +0000 |
commit | 1ef9001ca9c05ce22d2140c46856bbe52e61a6c5 (patch) | |
tree | 9a89a909d7815a001cae2b7e7f7e79b494e507a9 /device | |
parent | 880a57f7ad4f7812e65006cdf6e872f3bce01db6 (diff) | |
download | chromium_src-1ef9001ca9c05ce22d2140c46856bbe52e61a6c5.zip chromium_src-1ef9001ca9c05ce22d2140c46856bbe52e61a6c5.tar.gz chromium_src-1ef9001ca9c05ce22d2140c46856bbe52e61a6c5.tar.bz2 |
Removes MessageLoop::TYPE_XXX where possible
This is part of attempting to get rid of MessageLoop::Type enum.
BUG=none
TEST=none
R=darin@chromium.org
Review URL: https://codereview.chromium.org/136683004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244996 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'device')
-rw-r--r-- | device/bluetooth/bluetooth_chromeos_unittest.cc | 42 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_profile_chromeos_unittest.cc | 5 |
2 files changed, 23 insertions, 24 deletions
diff --git a/device/bluetooth/bluetooth_chromeos_unittest.cc b/device/bluetooth/bluetooth_chromeos_unittest.cc index efc0b36..c49cee4 100644 --- a/device/bluetooth/bluetooth_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_chromeos_unittest.cc @@ -264,7 +264,7 @@ class BluetoothChromeOSTest : public testing::Test { ASSERT_TRUE(adapter_.get() != NULL); if (base::MessageLoop::current() == NULL) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; DiscoverDevices(); return; } @@ -508,7 +508,7 @@ TEST_F(BluetoothChromeOSTest, BecomeNotPowered) { } TEST_F(BluetoothChromeOSTest, StopDiscovery) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; GetAdapter(); @@ -551,7 +551,7 @@ TEST_F(BluetoothChromeOSTest, StopDiscovery) { } TEST_F(BluetoothChromeOSTest, StopDiscoveryAfterTwoStarts) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; GetAdapter(); @@ -623,7 +623,7 @@ TEST_F(BluetoothChromeOSTest, StopDiscoveryAfterTwoStarts) { TEST_F(BluetoothChromeOSTest, Discovery) { // Test a simulated discovery session. - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -670,7 +670,7 @@ TEST_F(BluetoothChromeOSTest, Discovery) { } TEST_F(BluetoothChromeOSTest, PoweredAndDiscovering) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; GetAdapter(); adapter_->SetPowered( @@ -1169,7 +1169,7 @@ TEST_F(BluetoothChromeOSTest, DisconnectUnconnectedDevice) { } TEST_F(BluetoothChromeOSTest, PairAppleMouse) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1230,7 +1230,7 @@ TEST_F(BluetoothChromeOSTest, PairAppleMouse) { } TEST_F(BluetoothChromeOSTest, PairAppleKeyboard) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1292,7 +1292,7 @@ TEST_F(BluetoothChromeOSTest, PairAppleKeyboard) { } TEST_F(BluetoothChromeOSTest, PairMotorolaKeyboard) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1375,7 +1375,7 @@ TEST_F(BluetoothChromeOSTest, PairMotorolaKeyboard) { } TEST_F(BluetoothChromeOSTest, PairSonyHeadphones) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1438,7 +1438,7 @@ TEST_F(BluetoothChromeOSTest, PairSonyHeadphones) { } TEST_F(BluetoothChromeOSTest, PairPhone) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1498,7 +1498,7 @@ TEST_F(BluetoothChromeOSTest, PairPhone) { } TEST_F(BluetoothChromeOSTest, PairWeirdDevice) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1559,7 +1559,7 @@ TEST_F(BluetoothChromeOSTest, PairWeirdDevice) { } TEST_F(BluetoothChromeOSTest, PairUnpairableDeviceFails) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1602,7 +1602,7 @@ TEST_F(BluetoothChromeOSTest, PairUnpairableDeviceFails) { } TEST_F(BluetoothChromeOSTest, PairingFails) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1646,7 +1646,7 @@ TEST_F(BluetoothChromeOSTest, PairingFails) { } TEST_F(BluetoothChromeOSTest, PairingFailsAtConnection) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1703,7 +1703,7 @@ TEST_F(BluetoothChromeOSTest, PairingFailsAtConnection) { } TEST_F(BluetoothChromeOSTest, PairingRejectedAtPinCode) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1750,7 +1750,7 @@ TEST_F(BluetoothChromeOSTest, PairingRejectedAtPinCode) { } TEST_F(BluetoothChromeOSTest, PairingCancelledAtPinCode) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1797,7 +1797,7 @@ TEST_F(BluetoothChromeOSTest, PairingCancelledAtPinCode) { } TEST_F(BluetoothChromeOSTest, PairingRejectedAtPasskey) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1844,7 +1844,7 @@ TEST_F(BluetoothChromeOSTest, PairingRejectedAtPasskey) { } TEST_F(BluetoothChromeOSTest, PairingCancelledAtPasskey) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1891,7 +1891,7 @@ TEST_F(BluetoothChromeOSTest, PairingCancelledAtPasskey) { } TEST_F(BluetoothChromeOSTest, PairingRejectedAtConfirmation) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1938,7 +1938,7 @@ TEST_F(BluetoothChromeOSTest, PairingRejectedAtConfirmation) { } TEST_F(BluetoothChromeOSTest, PairingCancelledAtConfirmation) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); @@ -1985,7 +1985,7 @@ TEST_F(BluetoothChromeOSTest, PairingCancelledAtConfirmation) { } TEST_F(BluetoothChromeOSTest, PairingCancelledInFlight) { - base::MessageLoop message_loop(base::MessageLoop::TYPE_DEFAULT); + base::MessageLoop message_loop; fake_bluetooth_device_client_->SetSimulationIntervalMs(10); GetAdapter(); diff --git a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc index 1792cda..dd7c945 100644 --- a/device/bluetooth/bluetooth_profile_chromeos_unittest.cc +++ b/device/bluetooth/bluetooth_profile_chromeos_unittest.cc @@ -31,8 +31,7 @@ namespace chromeos { class BluetoothProfileChromeOSTest : public testing::Test { public: BluetoothProfileChromeOSTest() - : message_loop_(base::MessageLoop::TYPE_IO), - callback_count_(0), + : callback_count_(0), error_callback_count_(0), profile_callback_count_(0), connection_callback_count_(0), @@ -102,7 +101,7 @@ class BluetoothProfileChromeOSTest : public testing::Test { } protected: - base::MessageLoop message_loop_; + base::MessageLoopForIO message_loop_; FakeBluetoothProfileManagerClient* fake_bluetooth_profile_manager_client_; scoped_refptr<BluetoothAdapter> adapter_; |