| Index: dbus/file_descriptor.h
|
| diff --git a/dbus/file_descriptor.h b/dbus/file_descriptor.h
|
| index 8fcab2f440f4b00f08784706ea246bb91b375129..f8e86777eafa870c75ec62d5df51f03ea753023e 100644
|
| --- a/dbus/file_descriptor.h
|
| +++ b/dbus/file_descriptor.h
|
| @@ -7,7 +7,7 @@
|
|
|
| #include <memory>
|
|
|
| -#include "base/move.h"
|
| +#include "base/macros.h"
|
| #include "dbus/dbus_export.h"
|
|
|
| namespace dbus {
|
| @@ -34,8 +34,6 @@ namespace dbus {
|
| // also allows the caller to do this work on the File thread to conform
|
| // with i/o restrictions.
|
| class CHROME_DBUS_EXPORT FileDescriptor {
|
| - MOVE_ONLY_TYPE_FOR_CPP_03(FileDescriptor);
|
| -
|
| public:
|
| // This provides a simple way to pass around file descriptors since they must
|
| // be closed on a thread that is allowed to perform I/O.
|
| @@ -82,6 +80,8 @@ class CHROME_DBUS_EXPORT FileDescriptor {
|
| int value_;
|
| bool owner_;
|
| bool valid_;
|
| +
|
| + DISALLOW_COPY_AND_ASSIGN(FileDescriptor);
|
| };
|
|
|
| using ScopedFileDescriptor =
|
|
|