1 files changed, 9 insertions, 19 deletions

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 84963c0..5df48a0 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) {
                                  0,
                                  &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) {
                                  0,
                                  &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),