Index: chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc |
diff --git a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc |
index 8ce3037417a41495500ebf94dc73402c0c069cdc..fd575c389a5feff550f5666e22a6fd2fc75fe632 100644 |
--- a/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc |
+++ b/chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc |
@@ -4,6 +4,8 @@ |
#include "chrome/browser/spellchecker/spellcheck_hunspell_dictionary.h" |
+#include <utility> |
+ |
#include "base/files/file_util.h" |
#include "base/logging.h" |
#include "base/message_loop/message_loop.h" |
@@ -79,17 +81,15 @@ SpellcheckHunspellDictionary::DictionaryFile::~DictionaryFile() { |
} |
} |
-SpellcheckHunspellDictionary::DictionaryFile::DictionaryFile(RValue other) |
- : path(other.object->path), |
- file(other.object->file.Pass()) { |
-} |
+SpellcheckHunspellDictionary::DictionaryFile::DictionaryFile( |
+ DictionaryFile&& other) |
+ : path(other.path), file(std::move(other.file)) {} |
SpellcheckHunspellDictionary::DictionaryFile& |
-SpellcheckHunspellDictionary::DictionaryFile::operator=(RValue other) { |
- if (this != other.object) { |
- path = other.object->path; |
- file = other.object->file.Pass(); |
- } |
+ SpellcheckHunspellDictionary::DictionaryFile:: |
+ operator=(DictionaryFile&& other) { |
+ path = other.path; |
+ file = std::move(other.file); |
return *this; |
} |