From 11c77f622ebe4a27669300d6908ef0e03ed5ace1 Mon Sep 17 00:00:00 2001
From: Mark Pilgrim <mpilgrim@brave.com>
Date: Fri, 26 Oct 2018 09:25:51 -0400
Subject: [PATCH] Disable reset report uploader and hide UI

Fixes https://github.com/brave/brave-browser/issues/1844
---
 ...-profile_resetter-reset_report_uploader.cc | 12 ++++++++++
 ...reset_page-reset_profile_dialog.html.patch | 15 ++++++++++++
 ...s-reset_page-reset_profile_dialog.js.patch | 23 +++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 patches/chrome-browser-profile_resetter-reset_report_uploader.cc
 create mode 100644 patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.html.patch
 create mode 100644 patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.js.patch

diff --git a/patches/chrome-browser-profile_resetter-reset_report_uploader.cc b/patches/chrome-browser-profile_resetter-reset_report_uploader.cc
new file mode 100644
index 000000000000..ef31989224b8
--- /dev/null
+++ b/patches/chrome-browser-profile_resetter-reset_report_uploader.cc
@@ -0,0 +1,12 @@
+diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc
+index 696cd4a6127f..24e6ce8873ed 100644
+--- a/chrome/browser/profile_resetter/reset_report_uploader.cc
++++ b/chrome/browser/profile_resetter/reset_report_uploader.cc
+@@ -48,6 +48,7 @@ void ResetReportUploader::DispatchReport(
+ 
+ void ResetReportUploader::DispatchReportInternal(
+     const std::string& request_data) {
++  return; // feature disabled in Brave
+   // Create traffic annotation tag.
+   net::NetworkTrafficAnnotationTag traffic_annotation =
+       net::DefineNetworkTrafficAnnotation("profile_resetter_upload", R"(
diff --git a/patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.html.patch b/patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.html.patch
new file mode 100644
index 000000000000..4f4d9ecbfed3
--- /dev/null
+++ b/patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.html.patch
@@ -0,0 +1,15 @@
+diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+index 64a6823036ba..714324e2a13f 100644
+--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
++++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.html
+@@ -44,10 +44,6 @@
+           $i18n{resetDialogCommit}
+         </paper-button>
+       </div>
+-      <div slot="footer">
+-        <cr-checkbox id="sendSettings" checked>
+-          $i18nRaw{resetPageFeedback}</cr-checkbox>
+-      </div>
+     </cr-dialog>
+   </template>
+   <script src="reset_profile_dialog.js"></script>
diff --git a/patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.js.patch b/patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.js.patch
new file mode 100644
index 000000000000..604bfc036073
--- /dev/null
+++ b/patches/chrome-browser-resources-settings-reset_page-reset_profile_dialog.js.patch
@@ -0,0 +1,23 @@
+diff --git a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.js b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.js
+index 0291bfffdcd5..12ff081941f1 100644
+--- a/chrome/browser/resources/settings/reset_page/reset_profile_dialog.js
++++ b/chrome/browser/resources/settings/reset_page/reset_profile_dialog.js
+@@ -75,9 +75,6 @@ Polymer({
+     this.addEventListener('cancel', () => {
+       this.browserProxy_.onHideResetProfileDialog();
+     });
+-
+-    this.$$('cr-checkbox a')
+-        .addEventListener('click', this.onShowReportedSettingsTap_.bind(this));
+   },
+ 
+   /** @private */
+@@ -123,7 +120,7 @@ Polymer({
+     this.clearingInProgress_ = true;
+     this.browserProxy_
+         .performResetProfileSettings(
+-            this.$.sendSettings.checked, this.resetRequestOrigin_)
++            false, this.resetRequestOrigin_)
+         .then(() => {
+           this.clearingInProgress_ = false;
+           if (this.$.dialog.open)