device/bluetooth/bluetooth_adapter_win_unittest.cc - Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra.

Unified Diff: device/bluetooth/bluetooth_adapter_win_unittest.cc

Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years 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

« chrome/browser/autocomplete/in_memory_url_index_unittest.cc ('K') | « components/storage_monitor/storage_monitor_win_unittest.cc ('k') | device/bluetooth/bluetooth_device_win_unittest.cc » ('j') | device/hid/hid_service_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: device/bluetooth/bluetooth_adapter_win_unittest.cc

diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc

index 2e2c7ae285172897a0bb32050ca1233d4a77a370..edead7049aeb6593bd9eb49ed85ebf40502ed15c 100644

--- a/device/bluetooth/bluetooth_adapter_win_unittest.cc

+++ b/device/bluetooth/bluetooth_adapter_win_unittest.cc

@@ -169,7 +169,7 @@ TEST_F(BluetoothAdapterWinTest, SingleStartDiscovery) {

base::Unretained(this)),

DiscoverySessionErrorCallback());

EXPECT_TRUE(ui_task_runner_->GetPendingTasks().empty());

- EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size());

EXPECT_FALSE(adapter_->IsDiscovering());

EXPECT_EQ(0, num_start_discovery_callbacks_);

adapter_win_->DiscoveryStarted(true);

@@ -201,7 +201,7 @@ TEST_F(BluetoothAdapterWinTest, MultipleStartDiscoveries) {

&BluetoothAdapterWinTest::IncrementNumStartDiscoveryCallbacks,

base::Unretained(this)),

DiscoverySessionErrorCallback());

- EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size());

}

EXPECT_TRUE(ui_task_runner_->GetPendingTasks().empty());

EXPECT_FALSE(adapter_->IsDiscovering());

@@ -317,7 +317,7 @@ TEST_F(BluetoothAdapterWinTest, MultipleStopDiscoveries) {

base::Bind(&BluetoothAdapterWinTest::IncrementNumStopDiscoveryCallbacks,

base::Unretained(this)),

DiscoverySessionErrorCallback());

- EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size());

EXPECT_TRUE(adapter_->IsDiscovering());

adapter_win_->DiscoveryStopped();

ui_task_runner_->RunPendingTasks();

@@ -348,7 +348,7 @@ TEST_F(BluetoothAdapterWinTest,

base::Bind(&BluetoothAdapterWinTest::IncrementNumStopDiscoveryCallbacks,

base::Unretained(this)),

DiscoverySessionErrorCallback());

- EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size());

}

TEST_F(BluetoothAdapterWinTest,

@@ -371,7 +371,7 @@ TEST_F(BluetoothAdapterWinTest, StartDiscoveryBeforeDiscoveryStopped) {

CallAddDiscoverySession(base::Closure(), DiscoverySessionErrorCallback());

bluetooth_task_runner_->ClearPendingTasks();

adapter_win_->DiscoveryStopped();

- EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size());

}

TEST_F(BluetoothAdapterWinTest, StopDiscoveryWithoutStartDiscovery) {

@@ -388,7 +388,7 @@ TEST_F(BluetoothAdapterWinTest, StopDiscoveryBeforeDiscoveryStarted) {

CallRemoveDiscoverySession(base::Closure(), DiscoverySessionErrorCallback());

bluetooth_task_runner_->ClearPendingTasks();

adapter_win_->DiscoveryStarted(true);

- EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size());

+ EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size());

}

TEST_F(BluetoothAdapterWinTest, StartAndStopBeforeDiscoveryStarted) {