| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 19 matching lines...) Expand all Loading... |
| 30 #include "base/threading/thread.h" | 30 #include "base/threading/thread.h" |
| 31 #include "base/threading/worker_pool.h" | 31 #include "base/threading/worker_pool.h" |
| 32 #include "base/time/time.h" | 32 #include "base/time/time.h" |
| 33 #include "base/trace_event/trace_event.h" | 33 #include "base/trace_event/trace_event.h" |
| 34 #include "build/build_config.h" | 34 #include "build/build_config.h" |
| 35 #include "chrome/browser/browser_process.h" | 35 #include "chrome/browser/browser_process.h" |
| 36 #include "chrome/browser/data_usage/tab_id_annotator.h" | 36 #include "chrome/browser/data_usage/tab_id_annotator.h" |
| 37 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" | 37 #include "chrome/browser/data_use_measurement/chrome_data_use_ascriber.h" |
| 38 #include "chrome/browser/net/async_dns_field_trial.h" | 38 #include "chrome/browser/net/async_dns_field_trial.h" |
| 39 #include "chrome/browser/net/chrome_network_delegate.h" | 39 #include "chrome/browser/net/chrome_network_delegate.h" |
| 40 #include "chrome/browser/net/connect_interceptor.h" |
| 40 #include "chrome/browser/net/dns_probe_service.h" | 41 #include "chrome/browser/net/dns_probe_service.h" |
| 41 #include "chrome/browser/net/proxy_service_factory.h" | 42 #include "chrome/browser/net/proxy_service_factory.h" |
| 42 #include "chrome/browser/net/sth_distributor_provider.h" | 43 #include "chrome/browser/net/sth_distributor_provider.h" |
| 43 #include "chrome/common/channel_info.h" | 44 #include "chrome/common/channel_info.h" |
| 44 #include "chrome/common/chrome_content_client.h" | 45 #include "chrome/common/chrome_content_client.h" |
| 45 #include "chrome/common/chrome_switches.h" | 46 #include "chrome/common/chrome_switches.h" |
| 46 #include "chrome/common/pref_names.h" | 47 #include "chrome/common/pref_names.h" |
| 47 #include "components/certificate_transparency/tree_state_tracker.h" | 48 #include "components/certificate_transparency/tree_state_tracker.h" |
| 48 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" | 49 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref
s.h" |
| 49 #include "components/data_usage/core/data_use_aggregator.h" | 50 #include "components/data_usage/core/data_use_aggregator.h" |
| (...skipping 1024 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1074 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1075 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1075 // system URLRequestContext too. There's no reason this should be tied to a | 1076 // system URLRequestContext too. There's no reason this should be tied to a |
| 1076 // profile. | 1077 // profile. |
| 1077 return context; | 1078 return context; |
| 1078 } | 1079 } |
| 1079 | 1080 |
| 1080 const metrics::UpdateUsagePrefCallbackType& | 1081 const metrics::UpdateUsagePrefCallbackType& |
| 1081 IOThread::GetMetricsDataUseForwarder() { | 1082 IOThread::GetMetricsDataUseForwarder() { |
| 1082 return metrics_data_use_forwarder_; | 1083 return metrics_data_use_forwarder_; |
| 1083 } | 1084 } |
| OLD | NEW |