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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
122 #include "chrome/browser/android/net/external_estimate_provider_android.h" | 122 #include "chrome/browser/android/net/external_estimate_provider_android.h" |
123 #include "components/data_usage/android/traffic_stats_amortizer.h" | 123 #include "components/data_usage/android/traffic_stats_amortizer.h" |
124 #endif | 124 #endif |
125 | 125 |
126 #if defined(OS_CHROMEOS) | 126 #if defined(OS_CHROMEOS) |
127 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" | 127 #include "chrome/browser/chromeos/net/cert_verify_proc_chromeos.h" |
128 #include "chromeos/network/host_resolver_impl_chromeos.h" | 128 #include "chromeos/network/host_resolver_impl_chromeos.h" |
129 #endif | 129 #endif |
130 | 130 |
131 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) | 131 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) |
132 #include <openssl/cpu.h> | |
133 #include "crypto/openssl_util.h" | 132 #include "crypto/openssl_util.h" |
| 133 #include "third_party/boringssl/src/include/openssl/cpu.h" |
134 #endif | 134 #endif |
135 | 135 |
136 using content::BrowserThread; | 136 using content::BrowserThread; |
137 | 137 |
138 class SafeBrowsingURLRequestContext; | 138 class SafeBrowsingURLRequestContext; |
139 | 139 |
140 // The IOThread object must outlive any tasks posted to the IO thread before the | 140 // The IOThread object must outlive any tasks posted to the IO thread before the |
141 // Quit task, so base::Bind() calls are not refcounted. | 141 // Quit task, so base::Bind() calls are not refcounted. |
142 | 142 |
143 namespace { | 143 namespace { |
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1074 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1074 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1075 // system URLRequestContext too. There's no reason this should be tied to a | 1075 // system URLRequestContext too. There's no reason this should be tied to a |
1076 // profile. | 1076 // profile. |
1077 return context; | 1077 return context; |
1078 } | 1078 } |
1079 | 1079 |
1080 const metrics::UpdateUsagePrefCallbackType& | 1080 const metrics::UpdateUsagePrefCallbackType& |
1081 IOThread::GetMetricsDataUseForwarder() { | 1081 IOThread::GetMetricsDataUseForwarder() { |
1082 return metrics_data_use_forwarder_; | 1082 return metrics_data_use_forwarder_; |
1083 } | 1083 } |
OLD | NEW |