MD Settings: Internet: Proxy: Support partial proxies

chrome/browser/resources/settings/internet_page/network_proxy.js

Index: chrome/browser/resources/settings/internet_page/network_proxy.js
diff --git a/chrome/browser/resources/settings/internet_page/network_proxy.js b/chrome/browser/resources/settings/internet_page/network_proxy.js
index 9e96db902cf9d7fd0e9f4c13a80b4076da7cf184..ddc1c1048c29168cb2e4e99aff5d5e3222204ca4 100644
--- a/chrome/browser/resources/settings/internet_page/network_proxy.js
+++ b/chrome/browser/resources/settings/internet_page/network_proxy.js
@@ -174,21 +174,23 @@ Polymer({
             /** @type {!CrOnc.ProxyLocation|undefined} */ (
                 CrOnc.getSimpleActiveProperties(
                     proxySettings.Manual.SecureHTTPProxy)) ||
-            proxy.Manual.HTTPProxy;
+            {Host: '', Port: 80};
         proxy.Manual.FTPProxy =
             /** @type {!CrOnc.ProxyLocation|undefined} */ (
                 CrOnc.getSimpleActiveProperties(
                     proxySettings.Manual.FTPProxy)) ||
-            proxy.Manual.HTTPProxy;
+            {Host: '', Port: 80};
         proxy.Manual.SOCKS =
             /** @type {!CrOnc.ProxyLocation|undefined} */ (
                 CrOnc.getSimpleActiveProperties(proxySettings.Manual.SOCKS)) ||
-            proxy.Manual.HTTPProxy;
+            {Host: '', Port: 80};
         var jsonHttp = proxy.Manual.HTTPProxy;
         this.useSameProxy_ =
-            CrOnc.proxyMatches(jsonHttp, proxy.Manual.SecureHTTPProxy) &&
-            CrOnc.proxyMatches(jsonHttp, proxy.Manual.FTPProxy) &&
-            CrOnc.proxyMatches(jsonHttp, proxy.Manual.SOCKS);
+            (CrOnc.proxyMatches(jsonHttp, proxy.Manual.SecureHTTPProxy) &&
+             CrOnc.proxyMatches(jsonHttp, proxy.Manual.FTPProxy) &&
+             CrOnc.proxyMatches(jsonHttp, proxy.Manual.SOCKS)) ||
+            (!proxy.Manual.SecureHTTPProxy.Host &&
+             !proxy.Manual.FTPProxy.Host && !proxy.Manual.SOCKS.Host);
       }
       if (proxySettings.ExcludeDomains) {
         proxy.ExcludeDomains = /** @type {!Array<string>|undefined} */ (
@@ -256,33 +258,36 @@ Polymer({
    * @private
    */
   sendProxyChange_: function() {
-    if (this.proxy_.Type == CrOnc.ProxySettingsType.MANUAL) {
-      var proxy =
-          /** @type {!CrOnc.ProxySettings} */ (Object.assign({}, this.proxy_));
+    var proxy =
+        /** @type {!CrOnc.ProxySettings} */ (Object.assign({}, this.proxy_));
+    if (proxy.Type == CrOnc.ProxySettingsType.MANUAL) {
       var manual = proxy.Manual;
-      var defaultProxy = manual.HTTPProxy;
-      if (!defaultProxy || !defaultProxy.Host)
-        return;
-      if (this.useSameProxy_ || !this.get('SecureHTTPProxy.Host', manual)) {
+      var defaultProxy = manual.HTTPProxy || {Host: '', Port: 80};
+      if (this.useSameProxy_) {
         proxy.Manual.SecureHTTPProxy = /** @type {!CrOnc.ProxyLocation} */ (
             Object.assign({}, defaultProxy));
-      }
-      if (this.useSameProxy_ || !this.get('FTPProxy.Host', manual)) {
         proxy.Manual.FTPProxy = /** @type {!CrOnc.ProxyLocation} */ (
             Object.assign({}, defaultProxy));
-      }
-      if (this.useSameProxy_ || !this.get('SOCKS.Host', manual)) {
         proxy.Manual.SOCKS = /** @type {!CrOnc.ProxyLocation} */ (
             Object.assign({}, defaultProxy));
+      } else {
+        // Remove properties with empty hosts to unset them.
+        if (manual.HTTPProxy && !manual.HTTPProxy.Host)
+          delete manual.HTTPProxy;
+        if (manual.SecureHTTPProxy && !manual.SecureHTTPProxy.Host)
+          delete manual.SecureHTTPProxy;
+        if (manual.FTPProxy && !manual.FTPProxy.Host)
+          delete manual.FTPProxy;
+        if (manual.SOCKS && !manual.SOCKS.Host)
+          delete manual.SOCKS;
       }
-      this.savedManual_ = Object.assign({}, proxy.Manual);
+      this.savedManual_ = Object.assign({}, manual);
       this.savedExcludeDomains_ = proxy.ExcludeDomains;
-      this.proxy_ = proxy;
-    } else if (this.proxy_.Type == CrOnc.ProxySettingsType.PAC) {
-      if (!this.proxy_.PAC)
+    } else if (proxy.Type == CrOnc.ProxySettingsType.PAC) {
+      if (!proxy.PAC)
         return;
     }
-    this.fire('proxy-change', {field: 'ProxySettings', value: this.proxy_});
+    this.fire('proxy-change', {field: 'ProxySettings', value: proxy});
     this.proxyModified_ = false;
   },
 
@@ -436,7 +441,12 @@ Polymer({
   isSaveManualProxyEnabled_: function() {
     if (!this.proxyModified_)
       return false;
-    return !!this.get('HTTPProxy.Host', this.proxy_.Manual);
+    var manual = this.proxy_.Manual;
+    var httpHost = this.get('HTTPProxy.Host', manual);
+    if (this.useSameProxy_)
+      return !!httpHost;
+    return !!httpHost || !!this.get('SecureHTTPProxy.Host', manual) ||
+        !!this.get('FTPProxy.Host', manual) || !!this.get('SOCKS.Host', manual);
   },
 
   /**