Enable (optional) blocking of webrequests in case a PAC script cannot be fetched or is invalid.

net/proxy/proxy_config.h

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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"
@@ skipping 129 matching lines @@
   }
 
   void set_pac_url(const GURL& url) {
     pac_url_ = url;
   }
 
   const GURL& pac_url() const {
     return pac_url_;
   }
 
+  void set_pac_mandatory(bool enable_pac_mandatory) {
+    pac_mandatory_ = enable_pac_mandatory;
+  }
+
+  bool pac_mandatory() const {
+    return pac_mandatory_;
+  }
+
   bool has_pac_url() const {
     return pac_url_.is_valid();
   }
 
   void set_auto_detect(bool enable_auto_detect) {
     auto_detect_ = enable_auto_detect;
   }
 
   bool auto_detect() const {
     return auto_detect_;
   }
 
+  void set_block_everything(bool enable_block_everything) {

[eroman, 2011/04/26 21:47:17]

I would rather not have this bool here, since it isn't really part of the
policy, but more of an implementation state variable.

I think you could accomplish this same thing by having a member variable in
ProxyService (of type "int" so it holds an error code). Since the
"block_everything()" bit is only checked from ProxyService anyway, it would
basically work the same.

Another idea I have been toying with, is breaking up ProxyConfig into an ordered
list of "rules", so it reads more like a directed acyclic graph (the fallback
policies would then be explicit in the datstructure, rather than something the
ProxyService decided). Just thinking out loud, not something you would want to
tackle for this change.

[battre, 2011/04/27 17:02:58]

I have introduced the int. I don't know whether this is overly generic, though.
As we don't use the value beyond a comparison to OK.

Done.

+    block_everything_ = enable_block_everything;
+  }
+
+  bool block_everything() const {
+    return block_everything_;
+  }
+
   // Helpers to construct some common proxy configurations.
 
   static ProxyConfig CreateDirect() {
     return ProxyConfig();
   }
 
   static ProxyConfig CreateAutoDetect() {
     ProxyConfig config;
     config.set_auto_detect(true);
     return config;
   }
 
   static ProxyConfig CreateFromCustomPacURL(const GURL& pac_url) {
     ProxyConfig config;
     config.set_pac_url(pac_url);
     return config;
   }
 
  private:
   // True if the proxy configuration should be auto-detected.
   bool auto_detect_;
 
   // 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_;
 
+  // If true, no traffic can be sent.
+  bool block_everything_;
+
   int id_;
 };
 
 }  // namespace net
 
 
 
 #endif  // NET_PROXY_PROXY_CONFIG_H_