Index: net/base/file_stream_context.cc |
diff --git a/net/base/file_stream_context.cc b/net/base/file_stream_context.cc |
index 3ddf4bbf508ea596c6be81c0eb6b4e70a807149f..04c0150b3b33d56219ae54dff94258fcc131d17f 100644 |
--- a/net/base/file_stream_context.cc |
+++ b/net/base/file_stream_context.cc |
@@ -54,17 +54,14 @@ FileStream::Context::OpenResult::OpenResult(base::File file, |
error_code(error_code) { |
} |
-FileStream::Context::OpenResult::OpenResult(RValue other) |
- : file(other.object->file.Pass()), |
- error_code(other.object->error_code) { |
-} |
+FileStream::Context::OpenResult::OpenResult(OpenResult&& other) |
+ : file(other.file.Pass()), error_code(other.error_code) {} |
FileStream::Context::OpenResult& FileStream::Context::OpenResult::operator=( |
- RValue other) { |
- if (this != other.object) { |
- file = other.object->file.Pass(); |
- error_code = other.object->error_code; |
- } |
+ OpenResult&& other) { |
+ DCHECK_NE(this, &other); |
danakj
2015/10/15 23:35:06
also not destructive, remove?
dcheng
2015/10/16 00:40:01
See above.
dcheng
2015/10/19 21:29:50
Done.
|
+ file = other.file.Pass(); |
+ error_code = other.error_code; |
return *this; |
} |