Merge 237541 "Revert of https://codereview.chromium.org/71013004/"

remoting/host/desktop_session_proxy.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/desktop_session_proxy.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/process/process_handle.h"
@@ skipping 212 matching lines @@
   if (!client_session_control_.get()) {
     base::CloseProcessHandle(desktop_process);
     return false;
   }
 
   desktop_process_ = desktop_process;
 
 #if defined(OS_WIN)
   // On Windows: |desktop_process| is a valid handle, but |desktop_pipe| needs
   // to be duplicated from the desktop process.
-  HANDLE temp_handle;
+  base::win::ScopedHandle pipe;
   if (!DuplicateHandle(desktop_process_, desktop_pipe, GetCurrentProcess(),
-                       &temp_handle, 0, FALSE, DUPLICATE_SAME_ACCESS)) {
+                       pipe.Receive(), 0, FALSE, DUPLICATE_SAME_ACCESS)) {
     LOG_GETLASTERROR(ERROR) << "Failed to duplicate the desktop-to-network"
                                " pipe handle";
 
     desktop_process_ = base::kNullProcessHandle;
     base::CloseProcessHandle(desktop_process);
     return false;
   }
-  base::win::ScopedHandle pipe(temp_handle);
 
   IPC::ChannelHandle desktop_channel_handle(pipe);
 
 #elif defined(OS_POSIX)
   // On posix: |desktop_pipe| is a valid file descriptor.
   DCHECK(desktop_pipe.auto_close);
 
   IPC::ChannelHandle desktop_channel_handle(std::string(), desktop_pipe);
 
 #else
@@ skipping 290 matching lines @@
 }
 
 // static
 void DesktopSessionProxyTraits::Destruct(
     const DesktopSessionProxy* desktop_session_proxy) {
   desktop_session_proxy->caller_task_runner_->DeleteSoon(FROM_HERE,
                                                          desktop_session_proxy);
 }
 
 }  // namespace remoting