Remove base/move.h

mojo/public/cpp/system/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_PUBLIC_CPP_SYSTEM_HANDLE_H_
 #define MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_
 
 #include <stdint.h>
 #include <limits>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
-#include "base/move.h"
 #include "mojo/public/c/system/functions.h"
 #include "mojo/public/c/system/types.h"
 
 namespace mojo {
 
 // OVERVIEW
 //
 // |Handle| and |...Handle|:
 //
 // |Handle| is a simple, copyable wrapper for the C type |MojoHandle| (which is
@@ skipping 40 matching lines @@
 //
 // An exception are some of the |...Raw()| functions. E.g., |CloseRaw()| takes a
 // |Handle|, leaving the user to discard the wrapper.
 //
 // ScopedHandleBase ------------------------------------------------------------
 
 // Scoper for the actual handle types defined further below. It's move-only,
 // like the C++11 |unique_ptr|.
 template <class HandleType>
 class ScopedHandleBase {
-  MOVE_ONLY_TYPE_FOR_CPP_03(ScopedHandleBase);
-
  public:
   using RawHandleType = HandleType;
 
   ScopedHandleBase() {}
   explicit ScopedHandleBase(HandleType handle) : handle_(handle) {}
   ~ScopedHandleBase() { CloseIfNecessary(); }
 
   template <class CompatibleHandleType>
   explicit ScopedHandleBase(ScopedHandleBase<CompatibleHandleType> other)
       : handle_(other.release()) {}
@@ skipping 39 matching lines @@
     return handle_.value() == other.get().value();
   }
 
  private:
   void CloseIfNecessary() {
     if (handle_.is_valid())
       handle_.Close();
   }
 
   HandleType handle_;
+
+  DISALLOW_COPY_AND_ASSIGN(ScopedHandleBase);
 };
 
 template <typename HandleType>
 inline ScopedHandleBase<HandleType> MakeScopedHandle(HandleType handle) {
   return ScopedHandleBase<HandleType>(handle);
 }
 
 // Handle ----------------------------------------------------------------------
 
 const MojoHandle kInvalidHandleValue = MOJO_HANDLE_INVALID;
@@ skipping 153 matching lines @@
 }
 
 // Comparison, so that |Handle|s can be used as keys in hash maps.
 inline bool operator==(const Handle a, const Handle b) {
   return a.value() == b.value();
 }
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_SYSTEM_HANDLE_H_