Remove old C++03 move emulation code.

content/child/scoped_web_callbacks.h

 // Copyright 2015 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 CONTENT_CHILD_SCOPED_WEB_CALLBACKS_H_
 #define CONTENT_CHILD_SCOPED_WEB_CALLBACKS_H_
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/move.h"
@@ skipping 46 matching lines @@
 //
 // If the bound RespondWithSuccess callback actually runs, PassCallbacks() will
 // reliquish ownership of the WebCallbacks object to a temporary scoped_ptr
 // which will be destroyed immediately after onSuccess is called.
 //
 // If the bound RespondWithSuccess callback is instead destroyed first,
 // the ScopedWebCallbacks destructor will invoke OnCallbacksDropped, executing
 // our desired default behavior before deleting the WebCallbacks.
 template <typename CallbacksType>
 class ScopedWebCallbacks {
-  MOVE_ONLY_TYPE_FOR_CPP_03(ScopedWebCallbacks, RValue);
+  MOVE_ONLY_TYPE_FOR_CPP_03(ScopedWebCallbacks);
 
  public:
   using DestructionCallback =
       base::Callback<void(scoped_ptr<CallbacksType> callbacks)>;
 
   ScopedWebCallbacks(scoped_ptr<CallbacksType> callbacks,
                      const DestructionCallback& destruction_callback)
       : callbacks_(callbacks.Pass()),
         destruction_callback_(destruction_callback) {}
 
   ~ScopedWebCallbacks() {
     if (callbacks_)
       destruction_callback_.Run(callbacks_.Pass());
   }
 
-  ScopedWebCallbacks(RValue other) { *this = other; }
+  ScopedWebCallbacks(ScopedWebCallbacks&& other) { *this = other.Pass(); }

[Nico, 2015/11/26 03:06:10]

consider std::move() instead of Pass()

[dcheng, 2015/11/26 03:10:41]

Done here and elsewhere (I'll upload this as soon as my current build for
another branch finishes).

 
-  ScopedWebCallbacks& operator=(RValue other) {
-    callbacks_ = other.object->callbacks_.Pass();
-    destruction_callback_ = other.object->destruction_callback_;
+  ScopedWebCallbacks& operator=(ScopedWebCallbacks&& other) {
+    callbacks_ = other.callbacks_.Pass();
+    destruction_callback_ = other.destruction_callback_;
     return *this;
   }
 
   scoped_ptr<CallbacksType> PassCallbacks() { return callbacks_.Pass(); }
 
  private:
   scoped_ptr<CallbacksType> callbacks_;
   DestructionCallback destruction_callback_;
 };
 
 template <typename CallbacksType>
 ScopedWebCallbacks<CallbacksType> make_scoped_web_callbacks(
     CallbacksType* callbacks,
     const typename ScopedWebCallbacks<CallbacksType>::DestructionCallback&
         destruction_callback) {
   return ScopedWebCallbacks<CallbacksType>(make_scoped_ptr(callbacks),
                                            destruction_callback);
 }
 
 #endif  // CONTENT_CHILD_SCOPED_WEB_CALLBACKS_H_