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

Side by Side Diff: ios/chrome/browser/history/web_history_service_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: 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/history/web_history_service_factory.h" 5 #include "ios/chrome/browser/history/web_history_service_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/browser_sync/browser/profile_sync_service.h" 9 #include "components/browser_sync/browser/profile_sync_service.h"
9 #include "components/history/core/browser/web_history_service.h" 10 #include "components/history/core/browser/web_history_service.h"
10 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 11 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
11 #include "components/prefs/pref_service.h" 12 #include "components/prefs/pref_service.h"
12 #include "components/signin/core/browser/profile_oauth2_token_service.h" 13 #include "components/signin/core/browser/profile_oauth2_token_service.h"
13 #include "components/signin/core/browser/signin_manager.h" 14 #include "components/signin/core/browser/signin_manager.h"
14 #include "components/sync_driver/sync_service.h" 15 #include "components/sync_driver/sync_service.h"
15 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 16 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
16 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h" 17 #include "ios/chrome/browser/signin/oauth2_token_service_factory.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 "WebHistoryService", 56 "WebHistoryService",
56 BrowserStateDependencyManager::GetInstance()) { 57 BrowserStateDependencyManager::GetInstance()) {
57 DependsOn(IOSChromeProfileSyncServiceFactory::GetInstance()); 58 DependsOn(IOSChromeProfileSyncServiceFactory::GetInstance());
58 DependsOn(OAuth2TokenServiceFactory::GetInstance()); 59 DependsOn(OAuth2TokenServiceFactory::GetInstance());
59 DependsOn(ios::SigninManagerFactory::GetInstance()); 60 DependsOn(ios::SigninManagerFactory::GetInstance());
60 } 61 }
61 62
62 WebHistoryServiceFactory::~WebHistoryServiceFactory() { 63 WebHistoryServiceFactory::~WebHistoryServiceFactory() {
63 } 64 }
64 65
65 scoped_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor( 66 std::unique_ptr<KeyedService> WebHistoryServiceFactory::BuildServiceInstanceFor(
66 web::BrowserState* context) const { 67 web::BrowserState* context) const {
67 ios::ChromeBrowserState* browser_state = 68 ios::ChromeBrowserState* browser_state =
68 ios::ChromeBrowserState::FromBrowserState(context); 69 ios::ChromeBrowserState::FromBrowserState(context);
69 return make_scoped_ptr(new history::WebHistoryService( 70 return base::WrapUnique(new history::WebHistoryService(
70 OAuth2TokenServiceFactory::GetForBrowserState(browser_state), 71 OAuth2TokenServiceFactory::GetForBrowserState(browser_state),
71 ios::SigninManagerFactory::GetForBrowserState(browser_state), 72 ios::SigninManagerFactory::GetForBrowserState(browser_state),
72 browser_state->GetRequestContext())); 73 browser_state->GetRequestContext()));
73 } 74 }
74 75
75 } // namespace ios 76 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698