| Index: sync/util/cryptographer.cc
|
| diff --git a/sync/util/cryptographer.cc b/sync/util/cryptographer.cc
|
| index 0fe0b25a3c8922329eede2daa12bf0b1368a795c..865f78adc158b9651364808457e6b44693db3e6a 100644
|
| --- a/sync/util/cryptographer.cc
|
| +++ b/sync/util/cryptographer.cc
|
| @@ -5,6 +5,7 @@
|
| #include "sync/util/cryptographer.h"
|
|
|
| #include <algorithm>
|
| +#include <utility>
|
|
|
| #include "base/base64.h"
|
| #include "base/basictypes.h"
|
| @@ -170,7 +171,7 @@ bool Cryptographer::AddKey(const KeyParams& params) {
|
| NOTREACHED(); // Invalid username or password.
|
| return false;
|
| }
|
| - return AddKeyImpl(nigori.Pass(), true);
|
| + return AddKeyImpl(std::move(nigori), true);
|
| }
|
|
|
| bool Cryptographer::AddNonDefaultKey(const KeyParams& params) {
|
| @@ -183,7 +184,7 @@ bool Cryptographer::AddNonDefaultKey(const KeyParams& params) {
|
| NOTREACHED(); // Invalid username or password.
|
| return false;
|
| }
|
| - return AddKeyImpl(nigori.Pass(), false);
|
| + return AddKeyImpl(std::move(nigori), false);
|
| }
|
|
|
| bool Cryptographer::AddKeyFromBootstrapToken(
|
| @@ -376,7 +377,7 @@ bool Cryptographer::ImportNigoriKey(const std::string& serialized_nigori_key) {
|
| return false;
|
| }
|
|
|
| - if (!AddKeyImpl(nigori.Pass(), true))
|
| + if (!AddKeyImpl(std::move(nigori), true))
|
| return false;
|
| return true;
|
| }
|
|
|