Remove base/move.h

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/macros.h"
-#include "base/move.h"
 #include "mojo/edk/embedder/platform_handle.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/c/system/macros.h"
 
 namespace mojo {
 namespace edk {
 
 class MOJO_SYSTEM_IMPL_EXPORT ScopedPlatformHandle {
-  DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(ScopedPlatformHandle)
-
  public:
   ScopedPlatformHandle() {}
   explicit ScopedPlatformHandle(PlatformHandle handle) : handle_(handle) {}
   ~ScopedPlatformHandle() { handle_.CloseIfNecessary(); }
 
   // Move-only constructor and operator=.
   ScopedPlatformHandle(ScopedPlatformHandle&& other)
       : handle_(other.release()) {}
 
   ScopedPlatformHandle& operator=(ScopedPlatformHandle&& other) {
@@ skipping 18 matching lines @@
 
   void reset(PlatformHandle handle = PlatformHandle()) {
     handle_.CloseIfNecessary();
     handle_ = handle;
   }
 
   bool is_valid() const { return handle_.is_valid(); }
 
  private:
   PlatformHandle handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedPlatformHandle);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_EMBEDDER_SCOPED_PLATFORM_HANDLE_H_