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

Side by Side Diff: ios/chrome/browser/application_context_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/application_context_impl.h" 5 #include "ios/chrome/browser/application_context_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/macros.h" 13 #include "base/macros.h"
14 #include "base/memory/ptr_util.h"
14 #include "base/path_service.h" 15 #include "base/path_service.h"
15 #include "base/time/default_clock.h" 16 #include "base/time/default_clock.h"
16 #include "base/time/default_tick_clock.h" 17 #include "base/time/default_tick_clock.h"
17 #include "base/tracked_objects.h" 18 #include "base/tracked_objects.h"
18 #include "components/component_updater/component_updater_service.h" 19 #include "components/component_updater/component_updater_service.h"
19 #include "components/component_updater/component_updater_service.h" 20 #include "components/component_updater/component_updater_service.h"
20 #include "components/gcm_driver/gcm_client_factory.h" 21 #include "components/gcm_driver/gcm_client_factory.h"
21 #include "components/gcm_driver/gcm_desktop_utils.h" 22 #include "components/gcm_driver/gcm_desktop_utils.h"
22 #include "components/gcm_driver/gcm_driver.h" 23 #include "components/gcm_driver/gcm_driver.h"
23 #include "components/history/core/browser/history_service.h" 24 #include "components/history/core/browser/history_service.h"
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 if (!chrome_browser_state_manager_) 214 if (!chrome_browser_state_manager_)
214 chrome_browser_state_manager_.reset(new ChromeBrowserStateManagerImpl()); 215 chrome_browser_state_manager_.reset(new ChromeBrowserStateManagerImpl());
215 return chrome_browser_state_manager_.get(); 216 return chrome_browser_state_manager_.get();
216 } 217 }
217 218
218 metrics_services_manager::MetricsServicesManager* 219 metrics_services_manager::MetricsServicesManager*
219 ApplicationContextImpl::GetMetricsServicesManager() { 220 ApplicationContextImpl::GetMetricsServicesManager() {
220 DCHECK(thread_checker_.CalledOnValidThread()); 221 DCHECK(thread_checker_.CalledOnValidThread());
221 if (!metrics_services_manager_) { 222 if (!metrics_services_manager_) {
222 metrics_services_manager_.reset( 223 metrics_services_manager_.reset(
223 new metrics_services_manager::MetricsServicesManager(make_scoped_ptr( 224 new metrics_services_manager::MetricsServicesManager(base::WrapUnique(
224 new IOSChromeMetricsServicesManagerClient(GetLocalState())))); 225 new IOSChromeMetricsServicesManagerClient(GetLocalState()))));
225 } 226 }
226 return metrics_services_manager_.get(); 227 return metrics_services_manager_.get();
227 } 228 }
228 229
229 metrics::MetricsService* ApplicationContextImpl::GetMetricsService() { 230 metrics::MetricsService* ApplicationContextImpl::GetMetricsService() {
230 DCHECK(thread_checker_.CalledOnValidThread()); 231 DCHECK(thread_checker_.CalledOnValidThread());
231 return GetMetricsServicesManager()->GetMetricsService(); 232 return GetMetricsServicesManager()->GetMetricsService();
232 } 233 }
233 234
(...skipping 10 matching lines...) Expand all
244 net_log::ChromeNetLog* ApplicationContextImpl::GetNetLog() { 245 net_log::ChromeNetLog* ApplicationContextImpl::GetNetLog() {
245 DCHECK(thread_checker_.CalledOnValidThread()); 246 DCHECK(thread_checker_.CalledOnValidThread());
246 return net_log_.get(); 247 return net_log_.get();
247 } 248 }
248 249
249 network_time::NetworkTimeTracker* 250 network_time::NetworkTimeTracker*
250 ApplicationContextImpl::GetNetworkTimeTracker() { 251 ApplicationContextImpl::GetNetworkTimeTracker() {
251 DCHECK(thread_checker_.CalledOnValidThread()); 252 DCHECK(thread_checker_.CalledOnValidThread());
252 if (!network_time_tracker_) { 253 if (!network_time_tracker_) {
253 network_time_tracker_.reset(new network_time::NetworkTimeTracker( 254 network_time_tracker_.reset(new network_time::NetworkTimeTracker(
254 make_scoped_ptr(new base::DefaultClock), 255 base::WrapUnique(new base::DefaultClock),
255 make_scoped_ptr(new base::DefaultTickClock), GetLocalState())); 256 base::WrapUnique(new base::DefaultTickClock), GetLocalState()));
256 } 257 }
257 return network_time_tracker_.get(); 258 return network_time_tracker_.get();
258 } 259 }
259 260
260 IOSChromeIOThread* ApplicationContextImpl::GetIOSChromeIOThread() { 261 IOSChromeIOThread* ApplicationContextImpl::GetIOSChromeIOThread() {
261 DCHECK(thread_checker_.CalledOnValidThread()); 262 DCHECK(thread_checker_.CalledOnValidThread());
262 DCHECK(ios_chrome_io_thread_.get()); 263 DCHECK(ios_chrome_io_thread_.get());
263 return ios_chrome_io_thread_.get(); 264 return ios_chrome_io_thread_.get();
264 } 265 }
265 266
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 341
341 base::FilePath store_path; 342 base::FilePath store_path;
342 CHECK(PathService::Get(ios::DIR_GLOBAL_GCM_STORE, &store_path)); 343 CHECK(PathService::Get(ios::DIR_GLOBAL_GCM_STORE, &store_path));
343 base::SequencedWorkerPool* worker_pool = web::WebThread::GetBlockingPool(); 344 base::SequencedWorkerPool* worker_pool = web::WebThread::GetBlockingPool();
344 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner( 345 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
345 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( 346 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
346 worker_pool->GetSequenceToken(), 347 worker_pool->GetSequenceToken(),
347 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); 348 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
348 349
349 gcm_driver_ = gcm::CreateGCMDriverDesktop( 350 gcm_driver_ = gcm::CreateGCMDriverDesktop(
350 make_scoped_ptr(new gcm::GCMClientFactory), GetLocalState(), store_path, 351 base::WrapUnique(new gcm::GCMClientFactory), GetLocalState(), store_path,
351 GetSystemURLRequestContext(), ::GetChannel(), 352 GetSystemURLRequestContext(), ::GetChannel(),
352 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), 353 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
353 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO), 354 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),
354 blocking_task_runner); 355 blocking_task_runner);
355 } 356 }
OLDNEW
« no previous file with comments | « ios/chrome/browser/application_context_impl.h ('k') | ios/chrome/browser/autocomplete/autocomplete_classifier_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698