Track sources of proxy settings.

net/proxy/proxy_config.h

-// 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.
 
 #ifndef NET_PROXY_PROXY_CONFIG_H_
 #define NET_PROXY_PROXY_CONFIG_H_
 #pragma once
 
 #include <string>
 
 #include "googleurl/src/gurl.h"
 #include "net/base/net_export.h"
+#include "net/proxy/proxy_config_source.h"

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

I believe this should be sorted lower.

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

Done.

 #include "net/proxy/proxy_bypass_rules.h"
 #include "net/proxy/proxy_server.h"
 
 namespace base {
 class Value;
 }
 
 namespace net {
 
 class ProxyInfo;
@@ skipping 22 matching lines @@
 
     // Note that the default of TYPE_NO_RULES results in direct connections
     // being made when using this ProxyConfig.
     ProxyRules();
     ~ProxyRules();
 
     bool empty() const {
       return type == TYPE_NO_RULES;
     }
 
-    // Sets |result| with the proxy to use for |url| based on the current rules.
-    void Apply(const GURL& url, ProxyInfo* result);
+    // Sets |result| with the proxy to use for |url| based on the current
+    // rules. Returns true if applicable rules were found and |result| was set
+    // accordingly. If no rules are applicable, sets |result| to use direct
+    // connections and returns false.
+    bool Apply(const GURL& url, ProxyInfo* result) const;
 
     // Parses the rules from a string, indicating which proxies to use.
     //
     //   proxy-uri = [<proxy-scheme>"://"]<proxy-host>[":"<proxy-port>]
     //
     // If the proxy to use depends on the scheme of the URL, can instead specify
     // a semicolon separated list of:
     //
     //   <url-scheme>"="<proxy-uri>
     //
@@ skipping 48 matching lines @@
   ProxyConfig();
   ProxyConfig(const ProxyConfig& config);
   ~ProxyConfig();
   ProxyConfig& operator=(const ProxyConfig& config);
 
   // Used to numerically identify this configuration.
   ID id() const { return id_; }
   void set_id(ID id) { id_ = id; }
   bool is_valid() const { return id_ != kInvalidConfigID; }
 
-  // Returns true if the given config is equivalent to this config.
+  // Returns true if the given config is equivalent to this config.  The
+  // comparison ignores differences in |id()| and |source()|.
   bool Equals(const ProxyConfig& other) const;
 
   // Returns true if this config contains any "automatic" settings. See the
   // class description for what that means.
   bool HasAutomaticSettings() const;
 
   void ClearAutomaticSettings();
 
   // Creates a Value dump of this configuration. The caller is responsible for
   // deleting the returned value.
@@ skipping 28 matching lines @@
   }
 
   void set_auto_detect(bool enable_auto_detect) {
     auto_detect_ = enable_auto_detect;
   }
 
   bool auto_detect() const {
     return auto_detect_;
   }
 
+  void set_source(ProxyConfigSource source) {
+    source_ = source;
+  }
+
+  ProxyConfigSource source() const {
+    return source_;
+  }
+
   // Helpers to construct some common proxy configurations.
 
   static ProxyConfig CreateDirect() {
     return ProxyConfig();
   }
 
   static ProxyConfig CreateAutoDetect() {
     ProxyConfig config;
     config.set_auto_detect(true);
     return config;
@@ skipping 14 matching lines @@
   // If non-empty, indicates the URL of the proxy auto-config file to use.
   GURL pac_url_;
 
   // If true, blocks all traffic in case fetching the pac script from |pac_url_|
   // fails. Only valid if |pac_url_| is non-empty.
   bool pac_mandatory_;
 
   // Manual proxy settings.
   ProxyRules proxy_rules_;
 
+  // Source of proxy settings.
+  ProxyConfigSource source_;
+
   ID id_;
 };
 
 }  // namespace net
 
 
 
 #endif  // NET_PROXY_PROXY_CONFIG_H_