Properly notify the handle verifier when a handle is passed around. This CL fixes issues introduced…

base/win/scoped_handle.h

 // 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.
 
 #ifndef BASE_WIN_SCOPED_HANDLE_H_
 #define BASE_WIN_SCOPED_HANDLE_H_
 
 #include <windows.h>
 
 #include "base/base_export.h"
@@ skipping 31 matching lines @@
  public:
   typedef typename Traits::Handle Handle;
 
   GenericScopedHandle() : handle_(Traits::NullHandle()) {}
 
   explicit GenericScopedHandle(Handle handle) : handle_(Traits::NullHandle()) {
     Set(handle);
   }
 
   // Move constructor for C++03 move emulation of this type.
-  GenericScopedHandle(RValue& other) : handle_(other.Take()) {
+  GenericScopedHandle(RValue& other) : handle_(Traits::NullHandle()) {
+    Set(other.Take());
   }
 
   ~GenericScopedHandle() {
     Close();
   }
 
   bool IsValid() const {
     return Traits::IsHandleValid(handle_);
   }
 
   // Move operator= for C++03 move emulation of this type.
   GenericScopedHandle& operator=(RValue& other) {
-    // Swapping the handles helps to avoid problems while assigning a handle
-    // to itself. It is also cheap and matches base::scoped_ptr behavior.
-    Swap(other);
+    if (this != &other) {
+      Set(other.Take());
+    }
     return *this;
   }
 
   void Set(Handle handle) {
     if (handle_ != handle) {
       Close();
 
       if (Traits::IsHandleValid(handle)) {
         handle_ = handle;
         Verifier::StartTracking(handle, this, BASE_WIN_GET_CALLER,
@@ skipping 12 matching lines @@
 
   Handle* Receive() {
     DCHECK(!Traits::IsHandleValid(handle_)) << "Handle must be NULL";
 
     // We cannot track this case :(. Just tell the verifier about it.
     Verifier::StartTracking(INVALID_HANDLE_VALUE, this, BASE_WIN_GET_CALLER,
                             tracked_objects::GetProgramCounter());
     return &handle_;
   }
 
-  void Swap(GenericScopedHandle& other) {
-    Handle tmp = handle_;
-    handle_ = other.handle_;
-    other.handle_ = tmp;
-  }
-
   // Transfers ownership away from this object.
   Handle Take() {
     Handle temp = handle_;
     handle_ = Traits::NullHandle();
     Verifier::StopTracking(temp, this, BASE_WIN_GET_CALLER,
                            tracked_objects::GetProgramCounter());
     return temp;
   }
 
   // Explicitly closes the owned handle.
@@ skipping 66 matching lines @@
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(VerifierTraits);
 };
 
 typedef GenericScopedHandle<HandleTraits, VerifierTraits> ScopedHandle;
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_SCOPED_HANDLE_WIN_H_