Remove implicit HANDLE conversions from base.

base/win/event_trace_consumer_unittest.cc

Index: base/win/event_trace_consumer_unittest.cc
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc
index 3231240877ef90b56fdfb5da4a0a729ccbbe92b1..92e91b9183b13013be03ee07432654cc627a355b 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -149,13 +149,13 @@ class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
 
   HRESULT StartConsumerThread() {
     consumer_ready_.Set(::CreateEvent(NULL, TRUE, FALSE, NULL));
-    EXPECT_TRUE(consumer_ready_ != NULL);
+    EXPECT_TRUE(consumer_ready_.IsValid());
     consumer_thread_.Set(::CreateThread(NULL, 0, ConsumerThreadMainProc, this,
                                         0, NULL));
     if (consumer_thread_.Get() == NULL)
       return HRESULT_FROM_WIN32(::GetLastError());
 
-    HANDLE events[] = { consumer_ready_, consumer_thread_ };
+    HANDLE events[] = { consumer_ready_.Get(), consumer_thread_.Get() };
     DWORD result = ::WaitForMultipleObjects(arraysize(events), events,
                                             FALSE, INFINITE);
     switch (result) {
@@ -165,10 +165,10 @@ class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
       case WAIT_OBJECT_0 + 1: {
           // The thread finished. This may race with the event, so check
           // explicitly for the event here, before concluding there's trouble.
-          if (::WaitForSingleObject(consumer_ready_, 0) == WAIT_OBJECT_0)
+          if (::WaitForSingleObject(consumer_ready_.Get(), 0) == WAIT_OBJECT_0)
             return S_OK;
           DWORD exit_code = 0;
-          if (::GetExitCodeThread(consumer_thread_, &exit_code))
+          if (::GetExitCodeThread(consumer_thread_.Get(), &exit_code))
             return exit_code;
           return HRESULT_FROM_WIN32(::GetLastError());
         }
@@ -179,11 +179,13 @@ class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
 
   // Waits for consumer_ thread to exit, and returns its exit code.
   HRESULT JoinConsumerThread() {
-    if (::WaitForSingleObject(consumer_thread_, INFINITE) != WAIT_OBJECT_0)
+    if (::WaitForSingleObject(consumer_thread_.Get(), INFINITE) !=
+        WAIT_OBJECT_0) {
       return HRESULT_FROM_WIN32(::GetLastError());
+    }
 
     DWORD exit_code = 0;
-    if (::GetExitCodeThread(consumer_thread_, &exit_code))
+    if (::GetExitCodeThread(consumer_thread_.Get(), &exit_code))
       return exit_code;
 
     return HRESULT_FROM_WIN32(::GetLastError());
@@ -208,7 +210,7 @@ TEST_F(EtwTraceConsumerRealtimeTest, ConsumerReturnsWhenSessionClosed) {
   ASSERT_HRESULT_SUCCEEDED(StartConsumerThread());
 
   // Wait around for the consumer_ thread a bit.
-  ASSERT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(consumer_thread_, 50));
+  ASSERT_EQ(WAIT_TIMEOUT, ::WaitForSingleObject(consumer_thread_.Get(), 50));
   ASSERT_HRESULT_SUCCEEDED(controller.Stop(NULL));
 
   // The consumer_ returns success on session stop.
@@ -244,8 +246,8 @@ TEST_F(EtwTraceConsumerRealtimeTest, ConsumeEvent) {
 
   EtwMofEvent<1> event(kTestEventType, 1, TRACE_LEVEL_ERROR);
   EXPECT_EQ(ERROR_SUCCESS, provider.Log(&event.header));
-  EXPECT_EQ(WAIT_OBJECT_0, ::WaitForSingleObject(TestConsumer::sank_event_,
-                                                 INFINITE));
+  EXPECT_EQ(WAIT_OBJECT_0,
+            ::WaitForSingleObject(TestConsumer::sank_event_.Get(), INFINITE));
   ASSERT_HRESULT_SUCCEEDED(controller.Stop(NULL));
   ASSERT_HRESULT_SUCCEEDED(JoinConsumerThread());
   ASSERT_NE(0u, TestConsumer::events_.size());