Fix move.h's to use a concrete RValue carrier object rather than hacking a RValue&.

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_(Traits::NullHandle()) {
-    Set(other.Take());
+  GenericScopedHandle(RValue other) : handle_(Traits::NullHandle()) {
+    if (this != other.object) {

[Jeffrey Yasskin, 2012/10/12 20:34:47]

I think this can never be false.

[awong, 2012/10/12 20:44:12]

Oops. This was a error during a revert.  Fixed.

+      Set(other.object->Take());
+    }
   }
 
   ~GenericScopedHandle() {
     Close();
   }
 
   bool IsValid() const {
     return Traits::IsHandleValid(handle_);
   }
 
   // Move operator= for C++03 move emulation of this type.
-  GenericScopedHandle& operator=(RValue& other) {
-    if (this != &other) {
-      Set(other.Take());
-    }
+  GenericScopedHandle& operator=(RValue other) {
+    Set(other.object->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 100 matching lines @@
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(VerifierTraits);
 };
 
 typedef GenericScopedHandle<HandleTraits, VerifierTraits> ScopedHandle;
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_SCOPED_HANDLE_WIN_H_