Chromium Code Reviews| Index: ios/public/provider/chrome/browser/test_chrome_browser_provider.mm |
| diff --git a/ios/public/provider/chrome/browser/test_chrome_browser_provider.mm b/ios/public/provider/chrome/browser/test_chrome_browser_provider.mm |
| index f25e37a6559533f13e34c64307d44a5853f7235f..70e0c2ccb2a1ad0e3150a524a82360ff4d6f72c8 100644 |
| --- a/ios/public/provider/chrome/browser/test_chrome_browser_provider.mm |
| +++ b/ios/public/provider/chrome/browser/test_chrome_browser_provider.mm |
| @@ -5,14 +5,14 @@ |
| #include "ios/public/provider/chrome/browser/test_chrome_browser_provider.h" |
| #include "base/logging.h" |
| +#include "base/memory/ptr_util.h" |
| #include "ios/public/provider/chrome/browser/signin/fake_chrome_identity_service.h" |
| #import "ios/public/provider/chrome/browser/test_updatable_resource_provider.h" |
| namespace ios { |
| TestChromeBrowserProvider::TestChromeBrowserProvider() |
| - : chrome_identity_service_(new ios::FakeChromeIdentityService), |
| - test_updatable_resource_provider_(new TestUpdatableResourceProvider) {} |
| + : test_updatable_resource_provider_(new TestUpdatableResourceProvider) {} |
| TestChromeBrowserProvider::~TestChromeBrowserProvider() {} |
| @@ -23,7 +23,15 @@ TestChromeBrowserProvider* TestChromeBrowserProvider::GetTestProvider() { |
| return static_cast<TestChromeBrowserProvider*>(provider); |
| } |
| +void TestChromeBrowserProvider::SetChromeIdentityService( |
| + std::unique_ptr<ChromeIdentityService> service) { |
| + chrome_identity_service_.swap(service); |
|
rohitrao (ping after 24h)
2016/08/29 14:16:36
Why swap() instead of reset()?
bzanotti
2016/08/29 14:31:47
AFAIK, reset() cannot be used with two unique_ptr.
|
| +} |
| + |
| ChromeIdentityService* TestChromeBrowserProvider::GetChromeIdentityService() { |
| + if (!chrome_identity_service_) { |
| + SetChromeIdentityService(base::WrapUnique(new FakeChromeIdentityService())); |
| + } |
| return chrome_identity_service_.get(); |
| } |