Remove implicit HANDLE conversions from remoting.

remoting/host/win/elevated_controller.cc

 // Copyright (c) 2012 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 "remoting/host/win/elevated_controller.h"
 
 #include "base/file_version_info.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 96 matching lines @@
                   NULL));
 
   if (!file.IsValid()) {
     DWORD error = GetLastError();
     PLOG(ERROR) << "Failed to open '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   scoped_ptr<char[]> buffer(new char[kMaxConfigFileSize]);
   DWORD size = kMaxConfigFileSize;
-  if (!::ReadFile(file, &buffer[0], size, &size, NULL)) {
+  if (!::ReadFile(file.Get(), &buffer[0], size, &size, NULL)) {
     DWORD error = GetLastError();
     PLOG(ERROR) << "Failed to read '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   // Parse the JSON configuration, expecting it to contain a dictionary.
   std::string file_content(buffer.get(), size);
   scoped_ptr<base::Value> value(
       base::JSONReader::Read(file_content, base::JSON_ALLOW_TRAILING_COMMAS));
 
@@ skipping 42 matching lines @@
                   FILE_FLAG_SEQUENTIAL_SCAN,
                   NULL));
 
   if (!file.IsValid()) {
     DWORD error = GetLastError();
     PLOG(ERROR) << "Failed to create '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   DWORD written;
-  if (!WriteFile(file, content, static_cast<DWORD>(length), &written, NULL)) {
+  if (!WriteFile(file.Get(), content, static_cast<DWORD>(length), &written,
+                 NULL)) {
     DWORD error = GetLastError();
     PLOG(ERROR) << "Failed to write to '" << filename.value() << "'";
     return HRESULT_FROM_WIN32(error);
   }
 
   return S_OK;
 }
 
 // Moves a config file from its temporary location to its permanent location.
 HRESULT MoveConfigFileFromTemp(const base::FilePath& filename) {
@@ skipping 174 matching lines @@
 }
 
 STDMETHODIMP ElevatedController::StartDaemon() {
   ScopedScHandle service;
   HRESULT hr = OpenService(&service);
   if (FAILED(hr)) {
     return hr;
   }
 
   // Change the service start type to 'auto'.
-  if (!::ChangeServiceConfigW(service,
+  if (!::ChangeServiceConfigW(service.Get(),
                               SERVICE_NO_CHANGE,
                               SERVICE_AUTO_START,
                               SERVICE_NO_CHANGE,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL)) {
     DWORD error = GetLastError();
     PLOG(ERROR) << "Failed to change the '" << kWindowsServiceName
                 << "'service start type to 'auto'";
     return HRESULT_FROM_WIN32(error);
   }
 
   // Start the service.
-  if (!StartService(service, 0, NULL)) {
+  if (!StartService(service.Get(), 0, NULL)) {
     DWORD error = GetLastError();
     if (error != ERROR_SERVICE_ALREADY_RUNNING) {
       PLOG(ERROR) << "Failed to start the '" << kWindowsServiceName
                   << "'service";
 
       return HRESULT_FROM_WIN32(error);
     }
   }
 
   return S_OK;
 }
 
 STDMETHODIMP ElevatedController::StopDaemon() {
   ScopedScHandle service;
   HRESULT hr = OpenService(&service);
   if (FAILED(hr)) {
     return hr;
   }
 
   // Change the service start type to 'manual'.
-  if (!::ChangeServiceConfigW(service,
+  if (!::ChangeServiceConfigW(service.Get(),
                               SERVICE_NO_CHANGE,
                               SERVICE_DEMAND_START,
                               SERVICE_NO_CHANGE,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL,
                               NULL)) {
     DWORD error = GetLastError();
     PLOG(ERROR) << "Failed to change the '" << kWindowsServiceName
                 << "'service start type to 'manual'";
     return HRESULT_FROM_WIN32(error);
   }
 
   // Stop the service.
   SERVICE_STATUS status;
-  if (!ControlService(service, SERVICE_CONTROL_STOP, &status)) {
+  if (!ControlService(service.Get(), SERVICE_CONTROL_STOP, &status)) {
     DWORD error = GetLastError();
     if (error != ERROR_SERVICE_NOT_ACTIVE) {
       PLOG(ERROR) << "Failed to stop the '" << kWindowsServiceName
                   << "'service";
       return HRESULT_FROM_WIN32(error);
     }
   }
 
   return S_OK;
 }
@@ skipping 62 matching lines @@
   if (!scmanager.IsValid()) {
     error = GetLastError();
     PLOG(ERROR) << "Failed to connect to the service control manager";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   DWORD desired_access = SERVICE_CHANGE_CONFIG | SERVICE_QUERY_STATUS |
                          SERVICE_START | SERVICE_STOP;
   ScopedScHandle service(
-      ::OpenServiceW(scmanager, kWindowsServiceName, desired_access));
+      ::OpenServiceW(scmanager.Get(), kWindowsServiceName, desired_access));
   if (!service.IsValid()) {
     error = GetLastError();
     PLOG(ERROR) << "Failed to open to the '" << kWindowsServiceName
                 << "' service";
 
     return HRESULT_FROM_WIN32(error);
   }
 
   service_out->Set(service.Take());
   return S_OK;
 }
 
 } // namespace remoting