Merge remote-tracking branch 'origin/upstream-master' into 79-based

Conflicts:
	chromium/chrome/common/pref_names.cc
	chromium/chrome/common/pref_names.h

Change-Id: I9be20fb8dfd946e3db1fa298dce076db5fd1f397

1 files changed, 0 insertions, 33 deletions

diff --git a/chromium/chrome/browser/resources/settings/reset_page/powerwash_dialog.html b/chromium/chrome/browser/resources/settings/reset_page/powerwash_dialog.html
deleted file mode 100644
index 965e35fc1e5..00000000000
--- a/chromium/chrome/browser/resources/settings/reset_page/powerwash_dialog.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<link rel="import" href="chrome://resources/html/polymer.html">
-
-<link rel="import" href="chrome://resources/cr_elements/cr_button/cr_button.html">
-<link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
-<link rel="import" href="../lifetime_browser_proxy.html">
-<link rel="import" href="reset_browser_proxy.html">
-<link rel="import" href="../settings_shared_css.html">
-
-<dom-module id="settings-powerwash-dialog">
-  <template>
-    <style include="settings-shared">
-    </style>
-    <cr-dialog id="dialog" close-text="$i18n{close}"
-        ignore-enter-key>
-      <div slot="title">$i18n{powerwashDialogTitle}</div>
-      <div slot="body">
-        <span>
-          $i18n{powerwashDialogExplanation}
-          <a href="$i18nRaw{powerwashLearnMoreUrl}" target="_blank">
-            $i18n{learnMore}
-          </a>
-        </span>
-      </div>
-      <div slot="button-container">
-        <cr-button class="cancel-button" on-click="onCancelTap_"
-            id="cancel">$i18n{cancel}</cr-button>
-        <cr-button class="action-button" id="powerwash"
-            on-click="onRestartTap_">$i18n{powerwashDialogButton}</cr-button>
-      </div>
-    </cr-dialog>
-  </template>
-  <script src="powerwash_dialog.js"></script>
-</dom-module>