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

Side by Side Diff: chrome/browser/io_thread.cc

Issue 1296663003: Componentize proxy code from chrome/browser/net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: updating for win p/f Created 5 years, 3 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 (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 16 matching lines...) Expand all
27 #include "base/threading/worker_pool.h" 27 #include "base/threading/worker_pool.h"
28 #include "base/time/time.h" 28 #include "base/time/time.h"
29 #include "base/trace_event/trace_event.h" 29 #include "base/trace_event/trace_event.h"
30 #include "build/build_config.h" 30 #include "build/build_config.h"
31 #include "chrome/browser/browser_process.h" 31 #include "chrome/browser/browser_process.h"
32 #include "chrome/browser/net/async_dns_field_trial.h" 32 #include "chrome/browser/net/async_dns_field_trial.h"
33 #include "chrome/browser/net/chrome_net_log.h" 33 #include "chrome/browser/net/chrome_net_log.h"
34 #include "chrome/browser/net/chrome_network_delegate.h" 34 #include "chrome/browser/net/chrome_network_delegate.h"
35 #include "chrome/browser/net/connect_interceptor.h" 35 #include "chrome/browser/net/connect_interceptor.h"
36 #include "chrome/browser/net/dns_probe_service.h" 36 #include "chrome/browser/net/dns_probe_service.h"
37 #include "chrome/browser/net/pref_proxy_config_tracker.h"
38 #include "chrome/browser/net/proxy_service_factory.h" 37 #include "chrome/browser/net/proxy_service_factory.h"
39 #include "chrome/common/channel_info.h" 38 #include "chrome/common/channel_info.h"
40 #include "chrome/common/chrome_content_client.h" 39 #include "chrome/common/chrome_content_client.h"
41 #include "chrome/common/chrome_switches.h" 40 #include "chrome/common/chrome_switches.h"
42 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
43 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref s.h" 42 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_pref s.h"
44 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h" 43 #include "components/data_reduction_proxy/core/common/data_reduction_proxy_param s.h"
45 #include "components/policy/core/common/policy_service.h" 44 #include "components/policy/core/common/policy_service.h"
45 #include "components/proxy_config/pref_proxy_config_tracker.h"
46 #include "components/variations/variations_associated_data.h" 46 #include "components/variations/variations_associated_data.h"
47 #include "components/version_info/version_info.h" 47 #include "components/version_info/version_info.h"
48 #include "content/public/browser/browser_thread.h" 48 #include "content/public/browser/browser_thread.h"
49 #include "content/public/browser/cookie_store_factory.h" 49 #include "content/public/browser/cookie_store_factory.h"
50 #include "content/public/common/user_agent.h" 50 #include "content/public/common/user_agent.h"
51 #include "net/base/external_estimate_provider.h" 51 #include "net/base/external_estimate_provider.h"
52 #include "net/base/host_mapping_rules.h" 52 #include "net/base/host_mapping_rules.h"
53 #include "net/base/net_util.h" 53 #include "net/base/net_util.h"
54 #include "net/base/network_quality_estimator.h" 54 #include "net/base/network_quality_estimator.h"
55 #include "net/base/sdch_manager.h" 55 #include "net/base/sdch_manager.h"
(...skipping 1546 matching lines...) Expand 10 before | Expand all | Expand 10 after
1602 net::QuicVersionVector supported_versions = net::QuicSupportedVersions(); 1602 net::QuicVersionVector supported_versions = net::QuicSupportedVersions();
1603 for (size_t i = 0; i < supported_versions.size(); ++i) { 1603 for (size_t i = 0; i < supported_versions.size(); ++i) {
1604 net::QuicVersion version = supported_versions[i]; 1604 net::QuicVersion version = supported_versions[i];
1605 if (net::QuicVersionToString(version) == quic_version) { 1605 if (net::QuicVersionToString(version) == quic_version) {
1606 return version; 1606 return version;
1607 } 1607 }
1608 } 1608 }
1609 1609
1610 return net::QUIC_VERSION_UNSUPPORTED; 1610 return net::QUIC_VERSION_UNSUPPORTED;
1611 } 1611 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/settings_api_helpers.cc ('k') | chrome/browser/net/pref_proxy_config_tracker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698