Index: remoting/protocol/protocol_mock_objects.cc |
diff --git a/remoting/protocol/protocol_mock_objects.cc b/remoting/protocol/protocol_mock_objects.cc |
index fc6a3d53e0c247224da4e4aa35f601f962e44e77..b170ec405740bdec3ee3136f09dc770d828f7eab 100644 |
--- a/remoting/protocol/protocol_mock_objects.cc |
+++ b/remoting/protocol/protocol_mock_objects.cc |
@@ -59,7 +59,7 @@ scoped_ptr<base::ListValue> MockPairingRegistryDelegate::LoadAll() { |
++i) { |
result->Append(i->second.ToValue().release()); |
} |
- return result.Pass(); |
+ return result; |
} |
bool MockPairingRegistryDelegate::DeleteAll() { |
@@ -90,11 +90,9 @@ bool MockPairingRegistryDelegate::Delete(const std::string& client_id) { |
SynchronousPairingRegistry::SynchronousPairingRegistry( |
scoped_ptr<Delegate> delegate) |
- : PairingRegistry(base::ThreadTaskRunnerHandle::Get(), delegate.Pass()) { |
-} |
- |
-SynchronousPairingRegistry::~SynchronousPairingRegistry() { |
-} |
+ : PairingRegistry(base::ThreadTaskRunnerHandle::Get(), |
+ std::move(delegate)) {} |
+SynchronousPairingRegistry::~SynchronousPairingRegistry() {} |
void SynchronousPairingRegistry::PostTask( |
const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |