| OLD | NEW |
| 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" |
| (...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 215 if (!chrome_browser_state_manager_) | 215 if (!chrome_browser_state_manager_) |
| 216 chrome_browser_state_manager_.reset(new ChromeBrowserStateManagerImpl()); | 216 chrome_browser_state_manager_.reset(new ChromeBrowserStateManagerImpl()); |
| 217 return chrome_browser_state_manager_.get(); | 217 return chrome_browser_state_manager_.get(); |
| 218 } | 218 } |
| 219 | 219 |
| 220 metrics_services_manager::MetricsServicesManager* | 220 metrics_services_manager::MetricsServicesManager* |
| 221 ApplicationContextImpl::GetMetricsServicesManager() { | 221 ApplicationContextImpl::GetMetricsServicesManager() { |
| 222 DCHECK(thread_checker_.CalledOnValidThread()); | 222 DCHECK(thread_checker_.CalledOnValidThread()); |
| 223 if (!metrics_services_manager_) { | 223 if (!metrics_services_manager_) { |
| 224 metrics_services_manager_.reset( | 224 metrics_services_manager_.reset( |
| 225 new metrics_services_manager::MetricsServicesManager(base::WrapUnique( | 225 new metrics_services_manager::MetricsServicesManager( |
| 226 new IOSChromeMetricsServicesManagerClient(GetLocalState())))); | 226 base::MakeUnique<IOSChromeMetricsServicesManagerClient>( |
| 227 GetLocalState()))); |
| 227 } | 228 } |
| 228 return metrics_services_manager_.get(); | 229 return metrics_services_manager_.get(); |
| 229 } | 230 } |
| 230 | 231 |
| 231 metrics::MetricsService* ApplicationContextImpl::GetMetricsService() { | 232 metrics::MetricsService* ApplicationContextImpl::GetMetricsService() { |
| 232 DCHECK(thread_checker_.CalledOnValidThread()); | 233 DCHECK(thread_checker_.CalledOnValidThread()); |
| 233 return GetMetricsServicesManager()->GetMetricsService(); | 234 return GetMetricsServicesManager()->GetMetricsService(); |
| 234 } | 235 } |
| 235 | 236 |
| 236 variations::VariationsService* ApplicationContextImpl::GetVariationsService() { | 237 variations::VariationsService* ApplicationContextImpl::GetVariationsService() { |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 worker_pool->GetSequenceToken(), | 353 worker_pool->GetSequenceToken(), |
| 353 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); | 354 base::SequencedWorkerPool::SKIP_ON_SHUTDOWN)); |
| 354 | 355 |
| 355 gcm_driver_ = gcm::CreateGCMDriverDesktop( | 356 gcm_driver_ = gcm::CreateGCMDriverDesktop( |
| 356 base::WrapUnique(new gcm::GCMClientFactory), GetLocalState(), store_path, | 357 base::WrapUnique(new gcm::GCMClientFactory), GetLocalState(), store_path, |
| 357 GetSystemURLRequestContext(), ::GetChannel(), | 358 GetSystemURLRequestContext(), ::GetChannel(), |
| 358 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), | 359 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), |
| 359 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO), | 360 web::WebThread::GetTaskRunnerForThread(web::WebThread::IO), |
| 360 blocking_task_runner); | 361 blocking_task_runner); |
| 361 } | 362 } |
| OLD | NEW |