| Index: net/proxy/proxy_info.cc
|
| diff --git a/net/proxy/proxy_info.cc b/net/proxy/proxy_info.cc
|
| deleted file mode 100644
|
| index b659d671c22929d96e613a0023c741ca6bd40f0b..0000000000000000000000000000000000000000
|
| --- a/net/proxy/proxy_info.cc
|
| +++ /dev/null
|
| @@ -1,94 +0,0 @@
|
| -// Copyright (c) 2012 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#include "net/proxy/proxy_info.h"
|
| -
|
| -#include "net/proxy/proxy_retry_info.h"
|
| -
|
| -namespace net {
|
| -
|
| -ProxyInfo::ProxyInfo()
|
| - : config_id_(ProxyConfig::kInvalidConfigID),
|
| - config_source_(PROXY_CONFIG_SOURCE_UNKNOWN),
|
| - did_bypass_proxy_(false),
|
| - did_use_pac_script_(false) {
|
| -}
|
| -
|
| -ProxyInfo::~ProxyInfo() {
|
| -}
|
| -
|
| -void ProxyInfo::Use(const ProxyInfo& other) {
|
| - proxy_resolve_start_time_ = other.proxy_resolve_start_time_;
|
| - proxy_resolve_end_time_ = other.proxy_resolve_end_time_;
|
| - proxy_list_ = other.proxy_list_;
|
| - proxy_retry_info_ = other.proxy_retry_info_;
|
| - config_id_ = other.config_id_;
|
| - config_source_ = other.config_source_;
|
| - did_bypass_proxy_ = other.did_bypass_proxy_;
|
| - did_use_pac_script_ = other.did_use_pac_script_;
|
| -}
|
| -
|
| -void ProxyInfo::UseDirect() {
|
| - Reset();
|
| - proxy_list_.SetSingleProxyServer(ProxyServer::Direct());
|
| -}
|
| -
|
| -void ProxyInfo::UseDirectWithBypassedProxy() {
|
| - UseDirect();
|
| - did_bypass_proxy_ = true;
|
| -}
|
| -
|
| -void ProxyInfo::UseNamedProxy(const std::string& proxy_uri_list) {
|
| - Reset();
|
| - proxy_list_.Set(proxy_uri_list);
|
| -}
|
| -
|
| -void ProxyInfo::UseProxyServer(const ProxyServer& proxy_server) {
|
| - Reset();
|
| - proxy_list_.SetSingleProxyServer(proxy_server);
|
| -}
|
| -
|
| -void ProxyInfo::UsePacString(const std::string& pac_string) {
|
| - Reset();
|
| - proxy_list_.SetFromPacString(pac_string);
|
| -}
|
| -
|
| -void ProxyInfo::UseProxyList(const ProxyList& proxy_list) {
|
| - Reset();
|
| - proxy_list_ = proxy_list;
|
| -}
|
| -
|
| -void ProxyInfo::OverrideProxyList(const ProxyList& proxy_list) {
|
| - proxy_list_ = proxy_list;
|
| -}
|
| -
|
| -std::string ProxyInfo::ToPacString() const {
|
| - return proxy_list_.ToPacString();
|
| -}
|
| -
|
| -bool ProxyInfo::Fallback(int net_error, const BoundNetLog& net_log) {
|
| - return proxy_list_.Fallback(&proxy_retry_info_, net_error, net_log);
|
| -}
|
| -
|
| -void ProxyInfo::DeprioritizeBadProxies(
|
| - const ProxyRetryInfoMap& proxy_retry_info) {
|
| - proxy_list_.DeprioritizeBadProxies(proxy_retry_info);
|
| -}
|
| -
|
| -void ProxyInfo::RemoveProxiesWithoutScheme(int scheme_bit_field) {
|
| - proxy_list_.RemoveProxiesWithoutScheme(scheme_bit_field);
|
| -}
|
| -
|
| -void ProxyInfo::Reset() {
|
| - proxy_resolve_start_time_ = base::TimeTicks();
|
| - proxy_resolve_end_time_ = base::TimeTicks();
|
| - proxy_list_.Clear();
|
| - proxy_retry_info_.clear();
|
| - config_id_ = ProxyConfig::kInvalidConfigID;
|
| - config_source_ = PROXY_CONFIG_SOURCE_UNKNOWN;
|
| - did_bypass_proxy_ = false;
|
| - did_use_pac_script_ = false;
|
| -}
|
| -
|
| -} // namespace net
|
|
|