| Index: sync/util/cryptographer.cc
|
| diff --git a/sync/util/cryptographer.cc b/sync/util/cryptographer.cc
|
| index 7f5990d6964f2912d07b4c905d0cc1011c31a686..a301694e77a227380835d4e3f3ff4e3dfbac89ea 100644
|
| --- a/sync/util/cryptographer.cc
|
| +++ b/sync/util/cryptographer.cc
|
| @@ -5,8 +5,8 @@
|
| #include "sync/util/cryptographer.h"
|
|
|
| #include <stddef.h>
|
| -
|
| #include <algorithm>
|
| +#include <utility>
|
|
|
| #include "base/base64.h"
|
| #include "base/logging.h"
|
| @@ -171,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) {
|
| @@ -184,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(
|
| @@ -377,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;
|
| }
|
|
|