Use newer Chromium helper macro for defining move-only type.

mojo/edk/embedder/scoped_platform_handle.h

 // Copyright 2014 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 MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
 #define MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_
 
 #include "base/compiler_specific.h"
 #include "base/move.h"
 #include "mojo/edk/embedder/platform_handle.h"
 #include "mojo/edk/system/system_impl_export.h"
 
 namespace mojo {
 namespace embedder {
 
 class MOJO_SYSTEM_IMPL_EXPORT ScopedPlatformHandle {
-  MOVE_ONLY_TYPE_FOR_CPP_03(ScopedPlatformHandle, RValue)
+  MOVE_ONLY_TYPE_WITH_MOVE_CONSTRUCTOR_FOR_CPP_03(ScopedPlatformHandle)
 
  public:
   ScopedPlatformHandle() {}
   explicit ScopedPlatformHandle(PlatformHandle handle) : handle_(handle) {}
   ~ScopedPlatformHandle() { handle_.CloseIfNecessary(); }
 
   // Move-only constructor and operator=.
-  ScopedPlatformHandle(RValue other) : handle_(other.object->release()) {}
-  ScopedPlatformHandle& operator=(RValue other) {
-    handle_ = other.object->release();
+  ScopedPlatformHandle(ScopedPlatformHandle&& other)
+      : handle_(other.release()) {}
+
+  ScopedPlatformHandle& operator=(ScopedPlatformHandle&& other) {
+    if (this != &other) {

[viettrungluu, 2015/04/03 19:36:51]

nit: for consistency with surrounding code, please omit the braces here

[mgraczyk, 2015/04/03 19:44:27]

Done.

+      handle_ = other.release();
+    }
     return *this;
   }
 
   const PlatformHandle& get() const { return handle_; }
 
   void swap(ScopedPlatformHandle& other) {
     PlatformHandle temp = handle_;
     handle_ = other.handle_;
     other.handle_ = temp;
   }
@@ skipping 12 matching lines @@
   bool is_valid() const { return handle_.is_valid(); }
 
  private:
   PlatformHandle handle_;
 };
 
 }  // namespace embedder
 }  // namespace mojo
 
 #endif  // MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_