| Index: dbus/file_descriptor.cc
|
| diff --git a/dbus/file_descriptor.cc b/dbus/file_descriptor.cc
|
| index c740f28062244b83ddd8e0727f771a6f8b4ad050..b690881749f8fb10bf3e01ab8d9f12a7b59ab998 100644
|
| --- a/dbus/file_descriptor.cc
|
| +++ b/dbus/file_descriptor.cc
|
| @@ -21,9 +21,8 @@ void CHROME_DBUS_EXPORT FileDescriptor::Deleter::operator()(
|
| FROM_HERE, base::Bind(&base::DeletePointer<FileDescriptor>, fd), false);
|
| }
|
|
|
| -FileDescriptor::FileDescriptor(RValue other)
|
| - : value_(-1), owner_(false), valid_(false) {
|
| - Swap(other.object);
|
| +FileDescriptor::FileDescriptor(FileDescriptor&& other) : FileDescriptor() {
|
| + Swap(&other);
|
| }
|
|
|
| FileDescriptor::~FileDescriptor() {
|
| @@ -31,8 +30,8 @@ FileDescriptor::~FileDescriptor() {
|
| base::File auto_closer(value_);
|
| }
|
|
|
| -FileDescriptor& FileDescriptor::operator=(RValue other) {
|
| - Swap(other.object);
|
| +FileDescriptor& FileDescriptor::operator=(FileDescriptor&& other) {
|
| + Swap(&other);
|
| return *this;
|
| }
|
|
|
|
|