Add TLS-SRP (RFC 5054) support

chrome/browser/extensions/extension_proxy_api.cc

 // 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 "chrome/browser/extensions/extension_proxy_api.h"
 
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 // The scheme for which to use a manually specified proxy, not of the proxy URI
 // itself.
 enum {
   SCHEME_ALL = 0,
   SCHEME_HTTP,
   SCHEME_HTTPS,
+  SCHEME_HTTPSV,
   SCHEME_FTP,
   SCHEME_SOCKS,
   SCHEME_MAX = SCHEME_SOCKS  // Keep this value up to date.
 };
 
 // The names of the JavaScript properties to extract from the proxy_rules.
 // These must be kept in sync with the SCHEME_* constants.
 const char* field_name[] = { "singleProxy",
                              "proxyForHttp",
                              "proxyForHttps",
+                             "proxyForHttpsv",
                              "proxyForFtp",
                              "socksProxy" };
 
 // The names of the schemes to be used to build the preference value string
 // for manual proxy settings.  These must be kept in sync with the SCHEME_*
 // constants.
 const char* scheme_name[] = { "*error*",
                               "http",
                               "https",
+                              "httpsv",
                               "ftp",
                               "socks" };
 
 }  // namespace
 
 COMPILE_ASSERT(SCHEME_MAX == SCHEME_SOCKS, SCHEME_MAX_must_equal_SCHEME_SOCKS);
 COMPILE_ASSERT(arraysize(field_name) == SCHEME_MAX + 1,
                field_name_array_is_wrong_size);
 COMPILE_ASSERT(arraysize(scheme_name) == SCHEME_MAX + 1,
                scheme_name_array_is_wrong_size);
@@ skipping 101 matching lines @@
     if (has_proxy[i]) {
       if (!GetProxyServer(proxy_dict[i], &proxy_server[i]))
         return false;
     }
   }
 
   // A single proxy supersedes individual HTTP, HTTPS, and FTP proxies.
   if (has_proxy[SCHEME_ALL]) {
     proxy_server[SCHEME_HTTP] = proxy_server[SCHEME_ALL];
     proxy_server[SCHEME_HTTPS] = proxy_server[SCHEME_ALL];
+    proxy_server[SCHEME_HTTPSV] = proxy_server[SCHEME_ALL];
     proxy_server[SCHEME_FTP] = proxy_server[SCHEME_ALL];
     has_proxy[SCHEME_HTTP] = true;
     has_proxy[SCHEME_HTTPS] = true;
+    has_proxy[SCHEME_HTTPSV] = true;
     has_proxy[SCHEME_FTP] = true;
     has_proxy[SCHEME_ALL] = false;
   }
 
   // TODO(pamg): Ensure that if a value is empty, that means "don't use a proxy
   // for this scheme".
 
   // Build the proxy preference string.
   std::string proxy_pref;
   for (size_t i = 0; i <= SCHEME_MAX; ++i) {
@@ skipping 20 matching lines @@
 
 bool RemoveCustomProxySettingsFunction::RunImpl() {
   bool incognito = false;
   args_->GetBoolean(0, &incognito);
 
   RemovePreference(prefs::kProxyMode, incognito);
   RemovePreference(prefs::kProxyPacUrl, incognito);
   RemovePreference(prefs::kProxyServer, incognito);
   return true;
 }