Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(540)

Side by Side Diff: ios/chrome/browser/favicon/ios_chrome_large_icon_cache_factory.cc

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "ios/chrome/browser/favicon/ios_chrome_large_icon_cache_factory.h" 5 #include "ios/chrome/browser/favicon/ios_chrome_large_icon_cache_factory.h"
6 6
7 #include "base/memory/ptr_util.h"
7 #include "base/memory/singleton.h" 8 #include "base/memory/singleton.h"
8 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 9 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
9 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" 10 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
10 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 11 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
11 #include "ios/chrome/browser/favicon/large_icon_cache.h" 12 #include "ios/chrome/browser/favicon/large_icon_cache.h"
12 13
13 // static 14 // static
14 LargeIconCache* IOSChromeLargeIconCacheFactory::GetForBrowserState( 15 LargeIconCache* IOSChromeLargeIconCacheFactory::GetForBrowserState(
15 ios::ChromeBrowserState* browser_state) { 16 ios::ChromeBrowserState* browser_state) {
16 return static_cast<LargeIconCache*>( 17 return static_cast<LargeIconCache*>(
17 GetInstance()->GetServiceForBrowserState(browser_state, true)); 18 GetInstance()->GetServiceForBrowserState(browser_state, true));
18 } 19 }
19 20
20 // static 21 // static
21 IOSChromeLargeIconCacheFactory* IOSChromeLargeIconCacheFactory::GetInstance() { 22 IOSChromeLargeIconCacheFactory* IOSChromeLargeIconCacheFactory::GetInstance() {
22 return base::Singleton<IOSChromeLargeIconCacheFactory>::get(); 23 return base::Singleton<IOSChromeLargeIconCacheFactory>::get();
23 } 24 }
24 25
25 IOSChromeLargeIconCacheFactory::IOSChromeLargeIconCacheFactory() 26 IOSChromeLargeIconCacheFactory::IOSChromeLargeIconCacheFactory()
26 : BrowserStateKeyedServiceFactory( 27 : BrowserStateKeyedServiceFactory(
27 "LargeIconCache", 28 "LargeIconCache",
28 BrowserStateDependencyManager::GetInstance()) {} 29 BrowserStateDependencyManager::GetInstance()) {}
29 30
30 IOSChromeLargeIconCacheFactory::~IOSChromeLargeIconCacheFactory() {} 31 IOSChromeLargeIconCacheFactory::~IOSChromeLargeIconCacheFactory() {}
31 32
32 scoped_ptr<KeyedService> 33 std::unique_ptr<KeyedService>
33 IOSChromeLargeIconCacheFactory::BuildServiceInstanceFor( 34 IOSChromeLargeIconCacheFactory::BuildServiceInstanceFor(
34 web::BrowserState* context) const { 35 web::BrowserState* context) const {
35 return make_scoped_ptr(new LargeIconCache); 36 return base::WrapUnique(new LargeIconCache);
36 } 37 }
37 38
38 web::BrowserState* IOSChromeLargeIconCacheFactory::GetBrowserStateToUse( 39 web::BrowserState* IOSChromeLargeIconCacheFactory::GetBrowserStateToUse(
39 web::BrowserState* context) const { 40 web::BrowserState* context) const {
40 return GetBrowserStateOwnInstanceInIncognito(context); 41 return GetBrowserStateOwnInstanceInIncognito(context);
41 } 42 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698