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

net/proxy/proxy_config.cc

-// 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.
 
 #include "net/proxy/proxy_config.h"
 
 #include "base/logging.h"
 #include "base/string_tokenizer.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "net/proxy/proxy_info.h"
@@ skipping 139 matching lines @@
   DCHECK_EQ(TYPE_PROXY_PER_SCHEME, type);
   if (scheme == "http")
     return &proxy_for_http;
   if (scheme == "https")
     return &proxy_for_https;
   if (scheme == "ftp")
     return &proxy_for_ftp;
   return NULL;  // No mapping for this scheme.
 }
 
-ProxyConfig::ProxyConfig() : auto_detect_(false), id_(INVALID_ID) {
+ProxyConfig::ProxyConfig()
+    : auto_detect_(false), pac_mandatory_(false),
+      block_everything_(false), id_(INVALID_ID)  {
 }
 
 ProxyConfig::ProxyConfig(const ProxyConfig& config)
     : auto_detect_(config.auto_detect_),
       pac_url_(config.pac_url_),
+      pac_mandatory_(config.pac_mandatory_),
       proxy_rules_(config.proxy_rules_),
+      block_everything_(config.block_everything_),
       id_(config.id_) {
 }
 
 ProxyConfig::~ProxyConfig() {
 }
 
 ProxyConfig& ProxyConfig::operator=(const ProxyConfig& config) {
   auto_detect_ = config.auto_detect_;
   pac_url_ = config.pac_url_;
+  pac_mandatory_ = config.pac_mandatory_;
   proxy_rules_ = config.proxy_rules_;
+  block_everything_ = config.block_everything_;
   id_ = config.id_;
   return *this;
 }
 
 bool ProxyConfig::Equals(const ProxyConfig& other) const {
   // The two configs can have different IDs.  We are just interested in if they
   // have the same settings.
   return auto_detect_ == other.auto_detect_ &&
          pac_url_ == other.pac_url_ &&
-         proxy_rules_.Equals(other.proxy_rules());
+         pac_mandatory_ == other.pac_mandatory_ &&
+         proxy_rules_.Equals(other.proxy_rules()) &&
+         block_everything_ == other.block_everything_;
 }
 
 bool ProxyConfig::HasAutomaticSettings() const {
   return auto_detect_ || has_pac_url();
 }
 
 void ProxyConfig::ClearAutomaticSettings() {
   auto_detect_ = false;
   pac_url_ = GURL();
 }
 
 Value* ProxyConfig::ToValue() const {
   DictionaryValue* dict = new DictionaryValue();
 
   // Output the automatic settings.
   if (auto_detect_)
     dict->SetBoolean("auto_detect", auto_detect_);
   if (has_pac_url())
     dict->SetString("pac_url", pac_url_.possibly_invalid_spec());

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

The new properties should be mirrored here as well.

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

Done.

 
   // Output the manual settings.
   if (proxy_rules_.type != ProxyRules::TYPE_NO_RULES) {
     switch (proxy_rules_.type) {
       case ProxyRules::TYPE_SINGLE_PROXY:
         AddProxyToValue("single_proxy", proxy_rules_.single_proxy, dict);
         break;
       case ProxyRules::TYPE_PROXY_PER_SCHEME: {
         DictionaryValue* dict2 = new DictionaryValue();
         AddProxyToValue("http", proxy_rules_.proxy_for_http, dict2);
@@ skipping 22 matching lines @@
       }
 
       dict->Set("bypass_list", list);
     }
   }
 
   return dict;
 }
 
 }  // namespace net
-