Revert of Remove base/move.h

net/base/file_stream_context.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.
 
 // This file defines FileStream::Context class.
 // The general design of FileStream is as follows: file_stream.h defines
 // FileStream class which basically is just an "wrapper" not containing any
 // specific implementation details. It re-routes all its method calls to
 // the instance of FileStream::Context (FileStream holds a scoped_ptr to
 // FileStream::Context instance). Context was extracted into a different class
@@ skipping 15 matching lines @@
 
 #ifndef NET_BASE_FILE_STREAM_CONTEXT_H_
 #define NET_BASE_FILE_STREAM_CONTEXT_H_
 
 #include <stdint.h>
 
 #include "base/files/file.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/move.h"
 #include "base/single_thread_task_runner.h"
 #include "base/task_runner.h"
 #include "net/base/completion_callback.h"
 #include "net/base/file_stream.h"
 
 #if defined(OS_POSIX)
 #include <errno.h>
 #endif
 
 namespace base {
@@ skipping 59 matching lines @@
   struct IOResult {
     IOResult();
     IOResult(int64_t result, logging::SystemErrorCode os_error);
     static IOResult FromOSError(logging::SystemErrorCode os_error);
 
     int64_t result;
     logging::SystemErrorCode os_error;  // Set only when result < 0.
   };
 
   struct OpenResult {
+    MOVE_ONLY_TYPE_FOR_CPP_03(OpenResult)
    public:
     OpenResult();
     OpenResult(base::File file, IOResult error_code);
     OpenResult(OpenResult&& other);
     OpenResult& operator=(OpenResult&& other);
 
     base::File file;
     IOResult error_code;
-
-   private:
-    DISALLOW_COPY_AND_ASSIGN(OpenResult);
   };
 
   ////////////////////////////////////////////////////////////////////////////
   // Platform-independent methods implemented in file_stream_context.cc.
   ////////////////////////////////////////////////////////////////////////////
 
   OpenResult OpenFileImpl(const base::FilePath& path, int open_flags);
 
   IOResult CloseFileImpl();
 
@@ skipping 101 matching lines @@
   // Tracks the result of the IO completion operation. Set in OnIOComplete.
   int result_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Context);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_FILE_STREAM_CONTEXT_H_