Revert of Remove base/move.h

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"
 #include "base/gtest_prod_util.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "base/move.h"
 
 // TODO(rvargas): remove this with the rest of the verifier.
 #if defined(COMPILER_MSVC)
 #include <intrin.h>
 #define BASE_WIN_GET_CALLER _ReturnAddress()
 #elif defined(COMPILER_GCC)
 #define BASE_WIN_GET_CALLER __builtin_extract_return_addr(\\
     __builtin_return_address(0))
 #endif
 
 namespace base {
 namespace win {
 
 // Generic wrapper for raw handles that takes care of closing handles
 // automatically. The class interface follows the style of
 // the ScopedFILE class with two additions:
 //   - IsValid() method can tolerate multiple invalid handle values such as NULL
 //     and INVALID_HANDLE_VALUE (-1) for Win32 handles.
 //   - Set() (and the constructors and assignment operators that call it)
 //     preserve the Windows LastError code. This ensures that GetLastError() can
 //     be called after stashing a handle in a GenericScopedHandle object. Doing
 //     this explicitly is necessary because of bug 528394 and VC++ 2015.
 template <class Traits, class Verifier>
 class GenericScopedHandle {
+  MOVE_ONLY_TYPE_FOR_CPP_03(GenericScopedHandle)
+
  public:
   typedef typename Traits::Handle Handle;
 
   GenericScopedHandle() : handle_(Traits::NullHandle()) {}
 
   explicit GenericScopedHandle(Handle handle) : handle_(Traits::NullHandle()) {
     Set(handle);
   }
 
   GenericScopedHandle(GenericScopedHandle&& other)
@@ skipping 53 matching lines @@
 
       Traits::CloseHandle(handle_);
       handle_ = Traits::NullHandle();
     }
   }
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ScopedHandleTest, ActiveVerifierWrongOwner);
   FRIEND_TEST_ALL_PREFIXES(ScopedHandleTest, ActiveVerifierUntrackedHandle);
   Handle handle_;
-
-  DISALLOW_COPY_AND_ASSIGN(GenericScopedHandle);
 };
 
 #undef BASE_WIN_GET_CALLER
 
 // The traits class for Win32 handles that can be closed via CloseHandle() API.
 class HandleTraits {
  public:
   typedef HANDLE Handle;
 
   // Closes the handle.
@@ skipping 55 matching lines @@
 BASE_EXPORT void OnHandleBeingClosed(HANDLE handle);
 
 // This testing function returns the module that the ActiveVerifier concrete
 // implementation was instantiated in.
 BASE_EXPORT HMODULE GetHandleVerifierModuleForTesting();
 
 }  // namespace win
 }  // namespace base
 
 #endif  // BASE_WIN_SCOPED_HANDLE_H_