Make secure DNS setting also available from old privacy page.

We want to be able to rollout the secure DNS setting independently
from the privacy page redesign rollout.

Bug: 1040145
Change-Id: Iaf9b5e6a7ee5e4b6da442bd10e0107b569f122aa
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090096Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: Katharine Daly <dalyk@google.com>
Cr-Commit-Position: refs/heads/master@{#747536}

chrome/browser/resources/settings/privacy_page/privacy_page.html

@@ -9,6 +9,7 @@
 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
+<link rel="import" href="secure_dns.html">
 <link rel="import" href="security_page.html">
 <link rel="import" href="passwords_leak_detection_toggle.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html">
@@ -122,6 +123,9 @@
                 numeric-unchecked-value="[[networkPredictionUncheckedValue_]]"
                 on-settings-boolean-control-change="onNetworkPredictionChange_">
             </settings-toggle-button>
+            <template is="dom-if" if="[[showSecureDnsSetting_]]">
+              <settings-secure-dns prefs="{{prefs}}"></settings-secure-dns>
+            </template>
 <if expr="use_nss_certs or is_win or is_macosx">
             <cr-link-row id="manageCertificates"
                 class="hr"

chrome/browser/resources/settings/privacy_page/privacy_page.js

@@ -115,6 +115,18 @@ cr.define('settings', function() {
         },
       },
 
+      /**
+       * Whether the secure DNS setting should be displayed.
+       * @private
+       */
+      showSecureDnsSetting_: {
+        type: Boolean,
+        readOnly: true,
+        value: function() {
+          return loadTimeData.getBoolean('showSecureDnsSetting');
+        },
+      },
+
       /**
        * Whether the more settings list is opened.
        * @private