Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.cc

Issue 1178683009: Change histogram.h includes to histogram_macros.h in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "components/data_reduction_proxy/core/browser/data_reduction_proxy_netw ork_delegate.h" 5 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_netw ork_delegate.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/metrics/histogram.h" 9 #include "base/metrics/histogram_macros.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
11 #include "base/time/time.h" 11 #include "base/time/time.h"
12 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypa ss_stats.h" 12 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_bypa ss_stats.h"
13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig.h" 13 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf ig.h"
14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h" 14 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_conf igurator.h"
15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_expe riments_stats.h" 15 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_expe riments_stats.h"
16 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h" 16 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_d ata.h"
17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_requ est_options.h" 17 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_requ est_options.h"
18 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _creator.h" 18 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_event _creator.h"
19 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h" 19 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
305 DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial()) { 305 DataReductionProxyParams::IsIncludedInCriticalPathBypassFieldTrial()) {
306 if (!result->is_empty() && !result->is_direct() && 306 if (!result->is_empty() && !result->is_direct() &&
307 config->IsDataReductionProxy(result->proxy_server().host_port_pair(), 307 config->IsDataReductionProxy(result->proxy_server().host_port_pair(),
308 NULL)) { 308 NULL)) {
309 result->RemoveProxiesWithoutScheme(net::ProxyServer::SCHEME_DIRECT); 309 result->RemoveProxiesWithoutScheme(net::ProxyServer::SCHEME_DIRECT);
310 } 310 }
311 } 311 }
312 } 312 }
313 313
314 } // namespace data_reduction_proxy 314 } // namespace data_reduction_proxy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698