Remove implicit HANDLE conversions from elf.

chrome_elf/create_file/chrome_create_file_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_elf/create_file/chrome_create_file.h"
 
 #include <windows.h>
 
 #include <bitset>
 #include <string>
@@ skipping 224 matching lines @@
       file_handle.Set(CreateFileNTDLL(path.value().c_str(),
                                       GENERIC_WRITE,
                                       FILE_SHARE_READ,
                                       NULL,
                                       CREATE_ALWAYS,
                                       FILE_ATTRIBUTE_NORMAL | flag,
                                       NULL));
     }
 
 
-    EXPECT_FALSE(file_handle == INVALID_HANDLE_VALUE);
-    ::WriteFile(file_handle, kTestData, buffer_size, &bytes_written, NULL);
+    EXPECT_TRUE(file_handle.IsValid());
+    ::WriteFile(file_handle.Get(), kTestData, buffer_size, &bytes_written,
+                NULL);
     EXPECT_EQ(buffer_size, bytes_written);
   }
 
   void DoReadCheck(const base::FilePath& path, DWORD flag, bool is_system) {
     base::win::ScopedHandle file_handle;
     const char kTestData[] = "0123456789";
     int buffer_size = sizeof(kTestData) - 1;
     DWORD bytes_read;
     char read_buffer[10];
 
     if (is_system) {
       file_handle.Set(::CreateFileW(path.value().c_str(),
                                     GENERIC_READ,
                                     0,
                                     NULL,
                                     OPEN_ALWAYS,
                                     FILE_ATTRIBUTE_NORMAL | flag,
                                     NULL));
     } else {
       file_handle.Set(CreateFileNTDLL(path.value().c_str(),
                                       GENERIC_READ,
                                       0,
                                       NULL,
                                       OPEN_ALWAYS,
                                       FILE_ATTRIBUTE_NORMAL | flag,
                                       NULL));
     }
 
-    EXPECT_FALSE(file_handle == INVALID_HANDLE_VALUE);
-    ::ReadFile(file_handle, read_buffer, buffer_size, &bytes_read, NULL);
+    EXPECT_TRUE(file_handle.IsValid());
+    ::ReadFile(file_handle.Get(), read_buffer, buffer_size, &bytes_read, NULL);
     EXPECT_EQ(buffer_size, bytes_read);
     EXPECT_EQ(0, memcmp(kTestData, read_buffer, bytes_read));
   }
 
   void RunChecks(DWORD flag, bool check_reads) {
     // Make sure we can write to this file handle when called via the system.
     base::FilePath junk_path_1 = temp_dir_.path().Append(L"junk_1.txt");
     base::FilePath junk_path_2 = temp_dir_.path().Append(L"junk_2.txt");
     DoWriteCheck(junk_path_1, flag, true);
     DoWriteCheck(junk_path_2, flag, false);
@@ skipping 112 matching lines @@
   DoReadCheck(file_name, FILE_ATTRIBUTE_NORMAL, false);
 }
 
 TEST_F(ChromeCreateFileTest, ReadWriteFromThunk) {
   base::FilePath file_name = temp_dir_.path().Append(L"some_file.txt");
   DoWriteCheck(file_name, FILE_ATTRIBUTE_NORMAL, false);
   DoReadCheck(file_name, FILE_ATTRIBUTE_NORMAL, false);
 }
 
 }  // namespace