OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/profiles/profile_impl.h" | 5 #include "chrome/browser/profiles/profile_impl.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 673 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 data_reduction_proxy_chrome_configurator = chrome_configurator.get(); | 684 data_reduction_proxy_chrome_configurator = chrome_configurator.get(); |
685 #endif | 685 #endif |
686 | 686 |
687 // Make sure we initialize the ProfileIOData after everything else has been | 687 // Make sure we initialize the ProfileIOData after everything else has been |
688 // initialized that we might be reading from the IO thread. | 688 // initialized that we might be reading from the IO thread. |
689 | 689 |
690 io_data_.Init(cookie_path, channel_id_path, cache_path, | 690 io_data_.Init(cookie_path, channel_id_path, cache_path, |
691 cache_max_size, media_cache_path, media_cache_max_size, | 691 cache_max_size, media_cache_path, media_cache_max_size, |
692 extensions_cookie_path, GetPath(), infinite_cache_path, | 692 extensions_cookie_path, GetPath(), infinite_cache_path, |
693 predictor_, session_cookie_mode, GetSpecialStoragePolicy(), | 693 predictor_, session_cookie_mode, GetSpecialStoragePolicy(), |
694 CreateDomainReliabilityMonitor(), | 694 CreateDomainReliabilityMonitor(local_state), |
695 data_reduction_proxy_unavailable, | 695 data_reduction_proxy_unavailable, |
696 chrome_configurator.Pass(), | 696 chrome_configurator.Pass(), |
697 data_reduction_proxy_params.Pass()); | 697 data_reduction_proxy_params.Pass()); |
698 | 698 |
699 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 699 #if defined(SPDY_PROXY_AUTH_ORIGIN) |
700 data_reduction_proxy_chrome_settings->InitDataReductionProxySettings( | 700 data_reduction_proxy_chrome_settings->InitDataReductionProxySettings( |
701 data_reduction_proxy_chrome_configurator, | 701 data_reduction_proxy_chrome_configurator, |
702 prefs_.get(), | 702 prefs_.get(), |
703 g_browser_process->local_state(), | 703 g_browser_process->local_state(), |
704 GetRequestContext()); | 704 GetRequestContext()); |
(...skipping 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1443 if (chromeos::ProfileHelper::IsSigninProfile(this)) { | 1443 if (chromeos::ProfileHelper::IsSigninProfile(this)) { |
1444 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( | 1444 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState( |
1445 g_browser_process->local_state()); | 1445 g_browser_process->local_state()); |
1446 } | 1446 } |
1447 #endif // defined(OS_CHROMEOS) | 1447 #endif // defined(OS_CHROMEOS) |
1448 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( | 1448 return ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile( |
1449 GetPrefs(), g_browser_process->local_state()); | 1449 GetPrefs(), g_browser_process->local_state()); |
1450 } | 1450 } |
1451 | 1451 |
1452 scoped_ptr<domain_reliability::DomainReliabilityMonitor> | 1452 scoped_ptr<domain_reliability::DomainReliabilityMonitor> |
1453 ProfileImpl::CreateDomainReliabilityMonitor() { | 1453 ProfileImpl::CreateDomainReliabilityMonitor(PrefService* local_state) { |
1454 domain_reliability::DomainReliabilityService* service = | 1454 domain_reliability::DomainReliabilityService* service = |
1455 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> | 1455 domain_reliability::DomainReliabilityServiceFactory::GetInstance()-> |
1456 GetForBrowserContext(this); | 1456 GetForBrowserContext(this); |
1457 if (!service) | 1457 if (!service) |
1458 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); | 1458 return scoped_ptr<domain_reliability::DomainReliabilityMonitor>(); |
1459 | 1459 |
1460 return service->CreateMonitor( | 1460 return service->CreateMonitor( |
1461 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); | 1461 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
| 1462 local_state, |
| 1463 prefs::kMetricsReportingEnabled); |
1462 } | 1464 } |
OLD | NEW |