diff options
author | thakis <thakis@chromium.org> | 2015-12-10 11:29:57 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-12-10 19:30:43 +0000 |
commit | 6ef917b3602be64cc612dfbd78e45f1f80e4d8dd (patch) | |
tree | 28be680e5931100abbaf3618c51a456b2776ab9d /device | |
parent | fee6f33fbeebaf5776663307d041fc06ad93ef8f (diff) | |
download | chromium_src-6ef917b3602be64cc612dfbd78e45f1f80e4d8dd.zip chromium_src-6ef917b3602be64cc612dfbd78e45f1f80e4d8dd.tar.gz chromium_src-6ef917b3602be64cc612dfbd78e45f1f80e4d8dd.tar.bz2 |
clang/win: Let remaining chromium_code targets build with -Wextra.
This is a follow-up to https://codereview.chromium.org/1507413003/ and
lets all translation units in a release build build if -Wextra is enabled
for chromium_code targets.
(This CL does not contain the change to actually turn on -Wextra, only
cleanups.)
BUG=567877
Review URL: https://codereview.chromium.org/1513043002
Cr-Commit-Position: refs/heads/master@{#364425}
Diffstat (limited to 'device')
-rw-r--r-- | device/bluetooth/bluetooth_adapter_win_unittest.cc | 12 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_device_win_unittest.cc | 4 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_service_record_win_unittest.cc | 2 | ||||
-rw-r--r-- | device/bluetooth/bluetooth_task_manager_win_unittest.cc | 6 | ||||
-rw-r--r-- | device/hid/hid_service_win.cc | 3 |
5 files changed, 13 insertions, 14 deletions
diff --git a/device/bluetooth/bluetooth_adapter_win_unittest.cc b/device/bluetooth/bluetooth_adapter_win_unittest.cc index 2e2c7ae..edead70 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) { diff --git a/device/bluetooth/bluetooth_device_win_unittest.cc b/device/bluetooth/bluetooth_device_win_unittest.cc index c9d48a3..0fb9d32 100644 --- a/device/bluetooth/bluetooth_device_win_unittest.cc +++ b/device/bluetooth/bluetooth_device_win_unittest.cc @@ -86,12 +86,12 @@ class BluetoothDeviceWinTest : public testing::Test { TEST_F(BluetoothDeviceWinTest, GetUUIDs) { BluetoothDevice::UUIDList uuids = device_->GetUUIDs(); - EXPECT_EQ(2, uuids.size()); + EXPECT_EQ(2u, uuids.size()); EXPECT_EQ(kTestAudioSdpUuid, uuids[0]); EXPECT_EQ(kTestVideoSdpUuid, uuids[1]); uuids = empty_device_->GetUUIDs(); - EXPECT_EQ(0, uuids.size()); + EXPECT_EQ(0u, uuids.size()); } TEST_F(BluetoothDeviceWinTest, IsEqual) { diff --git a/device/bluetooth/bluetooth_service_record_win_unittest.cc b/device/bluetooth/bluetooth_service_record_win_unittest.cc index 274028e..116f740 100644 --- a/device/bluetooth/bluetooth_service_record_win_unittest.cc +++ b/device/bluetooth/bluetooth_service_record_win_unittest.cc @@ -60,7 +60,7 @@ TEST_F(BluetoothServiceRecordWinTest, BthAddr) { ConvertSdpBytes(kTestRfcommSdpBytes, &sdp_bytes_array); BluetoothServiceRecordWin service_record( "01:02:03:0A:10:A0", "Sdp", sdp_bytes_array, BluetoothUUID()); - EXPECT_EQ(1108152553632, service_record.device_bth_addr()); + EXPECT_EQ(1108152553632ull, service_record.device_bth_addr()); } } // namespace device diff --git a/device/bluetooth/bluetooth_task_manager_win_unittest.cc b/device/bluetooth/bluetooth_task_manager_win_unittest.cc index 0a82c7d..5e0f3ad 100644 --- a/device/bluetooth/bluetooth_task_manager_win_unittest.cc +++ b/device/bluetooth/bluetooth_task_manager_win_unittest.cc @@ -80,12 +80,12 @@ class BluetoothTaskManagerWinTest : public testing::Test { }; TEST_F(BluetoothTaskManagerWinTest, StartPolling) { - EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size()); + EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size()); } TEST_F(BluetoothTaskManagerWinTest, PollAdapterIfBluetoothStackIsAvailable) { bluetooth_task_runner_->RunPendingTasks(); - int num_expected_pending_tasks = has_bluetooth_stack_ ? 1 : 0; + size_t num_expected_pending_tasks = has_bluetooth_stack_ ? 1 : 0; EXPECT_EQ(num_expected_pending_tasks, bluetooth_task_runner_->GetPendingTasks().size()); } @@ -112,7 +112,7 @@ TEST_F(BluetoothTaskManagerWinTest, SetPowered) { base::Closure closure; task_manager_->PostSetPoweredBluetoothTask(true, closure, closure); - EXPECT_EQ(1, bluetooth_task_runner_->GetPendingTasks().size()); + EXPECT_EQ(1u, bluetooth_task_runner_->GetPendingTasks().size()); bluetooth_task_runner_->RunPendingTasks(); EXPECT_TRUE(ui_task_runner_->GetPendingTasks().size() >= 1); } diff --git a/device/hid/hid_service_win.cc b/device/hid/hid_service_win.cc index 0af821c..72ddd4c 100644 --- a/device/hid/hid_service_win.cc +++ b/device/hid/hid_service_win.cc @@ -290,8 +290,7 @@ base::win::ScopedHandle HidServiceWin::OpenDevice( CreateFileA(device_path.c_str(), GENERIC_WRITE | GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL)); - if (!file.IsValid() && - GetLastError() == base::File::FILE_ERROR_ACCESS_DENIED) { + if (!file.IsValid() && GetLastError() == ERROR_ACCESS_DENIED) { file.Set(CreateFileA(device_path.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL)); } |