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/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 #if defined(ENABLE_EXTENSIONS) | 109 #if defined(ENABLE_EXTENSIONS) |
110 #include "chrome/browser/extensions/event_router_forwarder.h" | 110 #include "chrome/browser/extensions/event_router_forwarder.h" |
111 #endif | 111 #endif |
112 | 112 |
113 #if defined(USE_NSS_CERTS) || defined(OS_IOS) | 113 #if defined(USE_NSS_CERTS) || defined(OS_IOS) |
114 #include "net/cert_net/nss_ocsp.h" | 114 #include "net/cert_net/nss_ocsp.h" |
115 #endif | 115 #endif |
116 | 116 |
117 #if defined(OS_ANDROID) | 117 #if defined(OS_ANDROID) |
118 #include "base/android/build_info.h" | 118 #include "base/android/build_info.h" |
| 119 #include "chrome/browser/android/data_usage/data_use_tab_model.h" |
119 #include "chrome/browser/android/data_usage/external_data_use_observer.h" | 120 #include "chrome/browser/android/data_usage/external_data_use_observer.h" |
120 #include "chrome/browser/android/net/external_estimate_provider_android.h" | 121 #include "chrome/browser/android/net/external_estimate_provider_android.h" |
121 #include "components/data_usage/android/traffic_stats_amortizer.h" | 122 #include "components/data_usage/android/traffic_stats_amortizer.h" |
122 #endif | 123 #endif |
123 | 124 |
124 #if defined(OS_CHROMEOS) | 125 #if defined(OS_CHROMEOS) |
125 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" | 126 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" |
126 #include "chromeos/network/host_resolver_impl_chromeos.h" | 127 #include "chromeos/network/host_resolver_impl_chromeos.h" |
127 #endif | 128 #endif |
128 | 129 |
(...skipping 503 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
632 chrome_network_delegate->set_data_use_aggregator( | 633 chrome_network_delegate->set_data_use_aggregator( |
633 globals_->data_use_aggregator.get(), | 634 globals_->data_use_aggregator.get(), |
634 true /* is_data_usage_off_the_record */); | 635 true /* is_data_usage_off_the_record */); |
635 | 636 |
636 #if defined(OS_ANDROID) | 637 #if defined(OS_ANDROID) |
637 globals_->external_data_use_observer.reset( | 638 globals_->external_data_use_observer.reset( |
638 new chrome::android::ExternalDataUseObserver( | 639 new chrome::android::ExternalDataUseObserver( |
639 globals_->data_use_aggregator.get(), | 640 globals_->data_use_aggregator.get(), |
640 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), | 641 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO), |
641 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); | 642 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI))); |
| 643 data_use_tab_model_ = |
| 644 globals_->external_data_use_observer->GetDataUseTabModel()->GetWeakPtr(); |
642 #endif | 645 #endif |
643 | 646 |
644 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 647 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
645 // is fixed. | 648 // is fixed. |
646 tracked_objects::ScopedTracker tracking_profile4( | 649 tracked_objects::ScopedTracker tracking_profile4( |
647 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 650 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
648 "466432 IOThread::InitAsync::CreateGlobalHostResolver")); | 651 "466432 IOThread::InitAsync::CreateGlobalHostResolver")); |
649 globals_->system_network_delegate = chrome_network_delegate.Pass(); | 652 globals_->system_network_delegate = chrome_network_delegate.Pass(); |
650 globals_->host_resolver = CreateGlobalHostResolver(net_log_); | 653 globals_->host_resolver = CreateGlobalHostResolver(net_log_); |
651 | 654 |
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1664 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); | 1667 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); |
1665 | 1668 |
1666 context->set_job_factory( | 1669 context->set_job_factory( |
1667 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1670 globals->proxy_script_fetcher_url_request_job_factory.get()); |
1668 | 1671 |
1669 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1672 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1670 // system URLRequestContext too. There's no reason this should be tied to a | 1673 // system URLRequestContext too. There's no reason this should be tied to a |
1671 // profile. | 1674 // profile. |
1672 return context; | 1675 return context; |
1673 } | 1676 } |
OLD | NEW |