Track sources of proxy settings.

net/proxy/proxy_info.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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) {
+ProxyInfo::ProxyInfo()
+    : config_id_(ProxyConfig::kInvalidConfigID),
+      config_source_(PROXY_CONFIG_SOURCE_UNKNOWN) {
 }
 
 ProxyInfo::~ProxyInfo() {
 }
 
 void ProxyInfo::Use(const ProxyInfo& other) {
   proxy_list_ = other.proxy_list_;
   proxy_retry_info_ = other.proxy_retry_info_;

[eroman, 2012/05/18 03:58:56]

Should this copy the source?

[asanka, 2012/05/18 16:27:01]

The original intent was to set/reset config_id_ and config_source_ together. The
config_id_ was only being modified in proxy_service.cc, so I chose to set the
config_source_ there as well.

I added set/reset for config_id_ and config_source_ here for consistency.

 }
 
 void ProxyInfo::UseDirect() {
   proxy_list_.SetSingleProxyServer(ProxyServer::Direct());
   proxy_retry_info_.clear();

[eroman, 2012/05/18 03:58:56]

Should this reset the source too?

[asanka, 2012/05/18 16:27:01]

Done. See above.

 }
 
 void ProxyInfo::UseNamedProxy(const std::string& proxy_uri_list) {
   proxy_list_.Set(proxy_uri_list);
   proxy_retry_info_.clear();

[eroman, 2012/05/18 03:58:56]

Should this reset the source too?

[asanka, 2012/05/18 16:27:01]

Done. See above.

 }
 
 void ProxyInfo::UseProxyServer(const ProxyServer& proxy_server) {
   proxy_list_.SetSingleProxyServer(proxy_server);
   proxy_retry_info_.clear();

[eroman, 2012/05/18 03:58:56]

Should this reset the source too?

[asanka, 2012/05/18 16:27:01]

Done. See above.

 }
 
 std::string ProxyInfo::ToPacString() const {
   return proxy_list_.ToPacString();
 }
 
 bool ProxyInfo::Fallback(const BoundNetLog& net_log) {
   return proxy_list_.Fallback(&proxy_retry_info_, 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);
 }
 
 }  // namespace net