| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/proximity_auth/mock_proximity_auth_client.h" | 5 #include "components/proximity_auth/mock_proximity_auth_client.h" |
| 6 | 6 |
| 7 #include "base/memory/ptr_util.h" |
| 8 |
| 7 namespace proximity_auth { | 9 namespace proximity_auth { |
| 8 | 10 |
| 9 MockProximityAuthClient::MockProximityAuthClient() {} | 11 MockProximityAuthClient::MockProximityAuthClient() {} |
| 10 | 12 |
| 11 MockProximityAuthClient::~MockProximityAuthClient() {} | 13 MockProximityAuthClient::~MockProximityAuthClient() {} |
| 12 | 14 |
| 13 scoped_ptr<SecureMessageDelegate> | 15 std::unique_ptr<SecureMessageDelegate> |
| 14 MockProximityAuthClient::CreateSecureMessageDelegate() { | 16 MockProximityAuthClient::CreateSecureMessageDelegate() { |
| 15 return make_scoped_ptr(CreateSecureMessageDelegatePtr()); | 17 return base::WrapUnique(CreateSecureMessageDelegatePtr()); |
| 16 } | 18 } |
| 17 | 19 |
| 18 scoped_ptr<CryptAuthClientFactory> | 20 std::unique_ptr<CryptAuthClientFactory> |
| 19 MockProximityAuthClient::CreateCryptAuthClientFactory() { | 21 MockProximityAuthClient::CreateCryptAuthClientFactory() { |
| 20 return make_scoped_ptr(CreateCryptAuthClientFactoryPtr()); | 22 return base::WrapUnique(CreateCryptAuthClientFactoryPtr()); |
| 21 } | 23 } |
| 22 | 24 |
| 23 } // proximity_auth | 25 } // proximity_auth |
| OLD | NEW |