Update from https://crrev.com/308331

net/proxy/proxy_resolver_script.h

+// Copyright (c) 2014 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_RESOLVER_SCRIPT_H_
+#define NET_PROXY_PROXY_RESOLVER_SCRIPT_H_
+
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 19 matching lines @@
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
-#ifndef NET_PROXY_PROXY_RESOLVER_SCRIPT_H_
-#define NET_PROXY_PROXY_RESOLVER_SCRIPT_H_
-
 // The following code was formatted from:
 //   'mozilla/netwerk/base/src/nsProxyAutoConfig.js' (1.55)
 //
 // Using the command:
 //   $ cat nsProxyAutoConfig.js |
 //       awk '/var pacUtils/,/EOF/' |
 //       sed -e 's/^\s*$/""/g' |
 //       sed -e 's/"\s*[+]\s*$/"/g' |
 //       sed -e 's/"$/" \\/g' |
 //       sed -e 's/\/(ipaddr);/\/.exec(ipaddr);/g' |
 //       grep -v '^var pacUtils ='
+//
+// isPlainHost() was removed.
 #define PROXY_RESOLVER_SCRIPT \
   "function dnsDomainIs(host, domain) {\n" \
   "    return (host.length >= domain.length &&\n" \
   "            host.substring(host.length - domain.length) == domain);\n" \
   "}\n" \
   "" \
   "function dnsDomainLevels(host) {\n" \
   "    return host.split('.').length-1;\n" \
   "}\n" \
   "" \
@@ skipping 16 matching lines @@
   "               test[3] > 255 || test[4] > 255) {\n" \
   "        return false;    // not an IP address\n" \
   "    }\n" \
   "    var host = convert_addr(ipaddr);\n" \
   "    var pat  = convert_addr(pattern);\n" \
   "    var mask = convert_addr(maskstr);\n" \
   "    return ((host & mask) == (pat & mask));\n" \
   "    \n" \
   "}\n" \
   "" \
-  "function isPlainHostName(host) {\n" \
-  "    return (host.search('\\\\.') == -1);\n" \
-  "}\n" \
-  "" \
   "function isResolvable(host) {\n" \
   "    var ip = dnsResolve(host);\n" \
   "    return (ip != null);\n" \
   "}\n" \
   "" \
   "function localHostOrDomainIs(host, hostdom) {\n" \
   "    return (host == hostdom) ||\n" \
   "           (hostdom.lastIndexOf(host + '.', 0) == 0);\n" \
   "}\n" \
   "" \
@@ skipping 163 matching lines @@
 
 // This is a Microsoft extension to PAC for IPv6, see:
 // http://blogs.msdn.com/b/wndp/archive/2006/07/13/ipv6-pac-extensions-v0-9.aspx
 #define PROXY_RESOLVER_SCRIPT_EX \
   "function isResolvableEx(host) {\n" \
   "    var ipList = dnsResolveEx(host);\n" \
   "    return (ipList != '');\n" \
   "}\n"
 
 #endif  // NET_PROXY_PROXY_RESOLVER_SCRIPT_H_