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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: device/bluetooth/bluetooth_adapter_chromeos_unittest.cc

Issue 12018024: Implemented Asynchronous Initialization of BluetoothAdapter. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Replaced bluetooth_includes_win.h with bluetooth_init_win.h Created 7 years, 11 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/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc » ('j') | device/bluetooth/bluetooth_adapter_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
diff --git a/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
index e0bfef1180581104e294516e6b01f91863ed6b5c..04fe98880c24e8a013678ac732478ed53450da64 100644
--- a/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
+++ b/device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
@@ -75,7 +75,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterNotPresent) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
ASSERT_TRUE(adapter_ != NULL);
@@ -105,7 +105,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithAddress) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -144,7 +144,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddress) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -199,7 +199,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterBecomesPresentWithAddress) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -246,7 +246,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithAddress) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -304,7 +304,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -364,7 +364,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterReplacedWithoutAddress) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -431,7 +431,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterRemoved) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -475,7 +475,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterWithoutAddressRemoved) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -520,7 +520,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -552,7 +552,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -594,7 +594,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -652,7 +652,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyChanged) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -703,7 +703,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterPoweredPropertyUnchanged) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -753,7 +753,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -825,7 +825,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -890,7 +890,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -962,7 +962,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1009,7 +1009,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPowered) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1058,7 +1058,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterSetPoweredError) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1108,7 +1108,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1140,7 +1140,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1182,7 +1182,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1240,7 +1240,7 @@ TEST_F(BluetoothAdapterChromeOsTest, DefaultAdapterDiscoveringPropertyChanged) {
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1292,7 +1292,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1343,7 +1343,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1415,7 +1415,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1481,7 +1481,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
@@ -1555,7 +1555,7 @@ TEST_F(BluetoothAdapterChromeOsTest,
EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
.WillOnce(SaveArg<0>(&adapter_callback));
- BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+ BluetoothAdapterFactory::GetAdapter(
base::Bind(&BluetoothAdapterChromeOsTest::SetAdapter,
base::Unretained(this)));
« no previous file with comments | « device/bluetooth/bluetooth_adapter.cc ('k') | device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc » ('j') | device/bluetooth/bluetooth_adapter_factory.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698