cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc - Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra.

Unified Diff: cloud_print/virtual_driver/win/port_monitor/port_monitor_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') | « chrome_elf/elf_imports_unittest.cc ('k') | components/browser_watcher/endsession_watcher_window_win_unittest.cc » ('j') | device/hid/hid_service_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc

diff --git a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc

index 84963c02f7a2538c080c245fd609636edc909096..5df48a02346bc8d8dc2142939aedaa5ec67a2839 100644

--- a/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc

+++ b/cloud_print/virtual_driver/win/port_monitor/port_monitor_unittest.cc

@@ -143,7 +143,7 @@ TEST_F(PortMonitorTest, EnumPortsTest) {

&needed_bytes,

&returned));

- EXPECT_EQ(ERROR_INSUFFICIENT_BUFFER, GetLastError());

+ EXPECT_EQ(static_cast<DWORD>(ERROR_INSUFFICIENT_BUFFER), GetLastError());

EXPECT_NE(0u, needed_bytes);

EXPECT_EQ(0u, returned);

@@ -171,7 +171,7 @@ TEST_F(PortMonitorTest, EnumPortsTest) {

&needed_bytes,

&returned));

- EXPECT_EQ(ERROR_INSUFFICIENT_BUFFER, GetLastError());

+ EXPECT_EQ(static_cast<DWORD>(ERROR_INSUFFICIENT_BUFFER), GetLastError());

EXPECT_NE(0u, needed_bytes);

EXPECT_EQ(0u, returned);

@@ -213,14 +213,9 @@ TEST_F(PortMonitorTest, FlowTest) {

EXPECT_TRUE(monitor2->pfnXcvOpenPort(monitor_handle, NULL, 0, &xcv_handle));

EXPECT_TRUE(xcv_handle != NULL);

EXPECT_TRUE(monitor2->pfnXcvDataPort != NULL);

- EXPECT_EQ(ERROR_ACCESS_DENIED,

- monitor2->pfnXcvDataPort(xcv_handle,

- kXcvDataItem,

- NULL,

- 0,

- buffer,

- kBufferSize,

- &bytes_needed));

+ EXPECT_EQ(static_cast<DWORD>(ERROR_ACCESS_DENIED),

+ monitor2->pfnXcvDataPort(xcv_handle, kXcvDataItem, NULL, 0, buffer,

+ kBufferSize, &bytes_needed));

EXPECT_TRUE(monitor2->pfnXcvClosePort != NULL);

EXPECT_TRUE(monitor2->pfnXcvClosePort(xcv_handle));

EXPECT_TRUE(monitor2->pfnXcvOpenPort(monitor_handle,

@@ -229,14 +224,9 @@ TEST_F(PortMonitorTest, FlowTest) {

&xcv_handle));

EXPECT_TRUE(xcv_handle != NULL);

EXPECT_TRUE(monitor2->pfnXcvDataPort != NULL);

- EXPECT_EQ(ERROR_SUCCESS,

- monitor2->pfnXcvDataPort(xcv_handle,

- kXcvDataItem,

- NULL,

- 0,

- buffer,

- kBufferSize,

- &bytes_needed));

+ EXPECT_EQ(static_cast<DWORD>(ERROR_SUCCESS),

+ monitor2->pfnXcvDataPort(xcv_handle, kXcvDataItem, NULL, 0, buffer,

+ kBufferSize, &bytes_needed));

EXPECT_TRUE(monitor2->pfnXcvClosePort != NULL);

EXPECT_TRUE(monitor2->pfnXcvClosePort(xcv_handle));

@@ -256,7 +246,7 @@ TEST_F(PortMonitorTest, FlowTest) {

buffer,

kBufferSize,

&bytes_processed));

- EXPECT_EQ(0, bytes_processed);

+ EXPECT_EQ(0u, bytes_processed);

EXPECT_FALSE(monitor2->pfnReadPort(port_handle,

buffer,

sizeof(buffer),