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

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: 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 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
217 if (!chrome_browser_state_manager_) 218 if (!chrome_browser_state_manager_)
218 chrome_browser_state_manager_.reset(new ChromeBrowserStateManagerImpl()); 219 chrome_browser_state_manager_.reset(new ChromeBrowserStateManagerImpl());
219 return chrome_browser_state_manager_.get(); 220 return chrome_browser_state_manager_.get();
220 } 221 }
221 222
222 metrics_services_manager::MetricsServicesManager* 223 metrics_services_manager::MetricsServicesManager*
223 ApplicationContextImpl::GetMetricsServicesManager() { 224 ApplicationContextImpl::GetMetricsServicesManager() {
224 DCHECK(thread_checker_.CalledOnValidThread()); 225 DCHECK(thread_checker_.CalledOnValidThread());
225 if (!metrics_services_manager_) { 226 if (!metrics_services_manager_) {
226 metrics_services_manager_.reset( 227 metrics_services_manager_.reset(
227 new metrics_services_manager::MetricsServicesManager(make_scoped_ptr( 228 new metrics_services_manager::MetricsServicesManager(base::WrapUnique(
228 new IOSChromeMetricsServicesManagerClient(GetLocalState())))); 229 new IOSChromeMetricsServicesManagerClient(GetLocalState()))));
229 } 230 }
230 return metrics_services_manager_.get(); 231 return metrics_services_manager_.get();
231 } 232 }
232 233
233 metrics::MetricsService* ApplicationContextImpl::GetMetricsService() { 234 metrics::MetricsService* ApplicationContextImpl::GetMetricsService() {
234 DCHECK(thread_checker_.CalledOnValidThread()); 235 DCHECK(thread_checker_.CalledOnValidThread());
235 return GetMetricsServicesManager()->GetMetricsService(); 236 return GetMetricsServicesManager()->GetMetricsService();
236 } 237 }
237 238
(...skipping 10 matching lines...) Expand all
248 net_log::ChromeNetLog* ApplicationContextImpl::GetNetLog() { 249 net_log::ChromeNetLog* ApplicationContextImpl::GetNetLog() {
249 DCHECK(thread_checker_.CalledOnValidThread()); 250 DCHECK(thread_checker_.CalledOnValidThread());
250 return net_log_.get(); 251 return net_log_.get();
251 } 252 }
252 253
253 network_time::NetworkTimeTracker* 254 network_time::NetworkTimeTracker*
254 ApplicationContextImpl::GetNetworkTimeTracker() { 255 ApplicationContextImpl::GetNetworkTimeTracker() {
255 DCHECK(thread_checker_.CalledOnValidThread()); 256 DCHECK(thread_checker_.CalledOnValidThread());
256 if (!network_time_tracker_) { 257 if (!network_time_tracker_) {
257 network_time_tracker_.reset(new network_time::NetworkTimeTracker( 258 network_time_tracker_.reset(new network_time::NetworkTimeTracker(
258 make_scoped_ptr(new base::DefaultClock), 259 base::WrapUnique(new base::DefaultClock),
259 make_scoped_ptr(new base::DefaultTickClock), GetLocalState())); 260 base::WrapUnique(new base::DefaultTickClock), GetLocalState()));
260 } 261 }
261 return network_time_tracker_.get(); 262 return network_time_tracker_.get();
262 } 263 }
263 264
264 IOSChromeIOThread* ApplicationContextImpl::GetIOSChromeIOThread() { 265 IOSChromeIOThread* ApplicationContextImpl::GetIOSChromeIOThread() {
265 DCHECK(thread_checker_.CalledOnValidThread()); 266 DCHECK(thread_checker_.CalledOnValidThread());
266 DCHECK(ios_chrome_io_thread_.get()); 267 DCHECK(ios_chrome_io_thread_.get());
267 return ios_chrome_io_thread_.get(); 268 return ios_chrome_io_thread_.get();
268 } 269 }
269 270
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 356
356 base::FilePath store_path; 357 base::FilePath store_path;
357 CHECK(PathService::Get(ios::DIR_GLOBAL_GCM_STORE, &store_path)); 358 CHECK(PathService::Get(ios::DIR_GLOBAL_GCM_STORE, &store_path));
358 base::SequencedWorkerPool* worker_pool = web::WebThread::GetBlockingPool(); 359 base::SequencedWorkerPool* worker_pool = web::WebThread::GetBlockingPool();
359 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner( 360 scoped_refptr<base::SequencedTaskRunner> blocking_task_runner(
360 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior( 361 worker_pool->GetSequencedTaskRunnerWithShutdownBehavior(
361 worker_pool->GetSequenceToken(), 362 worker_pool->GetSequenceToken(),
362 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); 363 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN));
363 364
364 gcm_driver_ = gcm::CreateGCMDriverDesktop( 365 gcm_driver_ = gcm::CreateGCMDriverDesktop(
365 make_scoped_ptr(new gcm::GCMClientFactory), GetLocalState(), store_path, 366 base::WrapUnique(new gcm::GCMClientFactory), GetLocalState(), store_path,
366 GetSystemURLRequestContext(), ::GetChannel(), 367 GetSystemURLRequestContext(), ::GetChannel(),
367 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), 368 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
368 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO), 369 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO),
369 blocking_task_runner); 370 blocking_task_runner);
370 } 371 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698