Merge pull request #745 from brave/mpilgrim_disable_reset_report_uplo…

…ader Disable reset report uploader and hide UI
brave · Oct 30, 2018 · 22db3e8 · 22db3e8
2 parents 74300e4 + 27606af
commit 22db3e8
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 0 deletions.
diff --git a/browser/resources/settings/reset_report_uploader_unittest.cc b/browser/resources/settings/reset_report_uploader_unittest.cc
@@ -0,0 +1,40 @@
+#include "chrome/browser/profile_resetter/reset_report_uploader.h"
+
+#include "base/test/bind_test_util.h"
+#include "base/test/scoped_task_environment.h"
+#include "services/network/public/cpp/weak_wrapper_shared_url_loader_factory.h"
+#include "services/network/test/test_url_loader_factory.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+class ResetReportUploaderTest : public testing::Test {
+ public:
+  ResetReportUploaderTest()
+      : test_shared_loader_factory_(
+            base::MakeRefCounted<network::WeakWrapperSharedURLLoaderFactory>(
+                &test_url_loader_factory_)) {}
+
+ protected:
+  scoped_refptr<network::SharedURLLoaderFactory> shared_url_loader_factory() {
+    return test_shared_loader_factory_;
+  }
+  network::TestURLLoaderFactory* test_url_loader_factory() {
+    return &test_url_loader_factory_;
+  }
+
+ private:
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
+  network::TestURLLoaderFactory test_url_loader_factory_;
+  scoped_refptr<network::SharedURLLoaderFactory> test_shared_loader_factory_;
+};
+
+TEST_F(ResetReportUploaderTest, NoFetch) {
+  bool network_access_occurred = false;
+  test_url_loader_factory()->SetInterceptor(
+    base::BindLambdaForTesting([&](const network::ResourceRequest& request) {
+                                   network_access_occurred = true;
+                               }));
+  ResetReportUploader* uploader =
+    new ResetReportUploader(shared_url_loader_factory());
+  uploader->DispatchReportInternal("");
+  EXPECT_FALSE(network_access_occurred);
+}
diff --git a/patches/chrome-browser-profile_resetter-reset_report_uploader.cc 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
@@ -0,0 +1,17 @@
+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..e29c828edc69 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,12 @@
+           $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
@@ -0,0 +1,22 @@
+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..62b9f8bc662b 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 */
+@@ -121,6 +118,7 @@ Polymer({
+   /** @private */
+   onResetTap_: function() {
+     this.clearingInProgress_ = true;
++    this.$.sendSettings.checked = { checked: false };
+     this.browserProxy_
+         .performResetProfileSettings(
+             this.$.sendSettings.checked, this.resetRequestOrigin_)
diff --git a/test/BUILD.gn b/test/BUILD.gn
@@ -46,6 +46,7 @@ test("brave_unit_tests") {
     "//brave/browser/profiles/tor_unittest_profile_manager.cc",
     "//brave/browser/profiles/tor_unittest_profile_manager.h",
     "//brave/browser/profiles/brave_profile_manager_unittest.cc",
+    "//brave/browser/resources/settings/reset_report_uploader_unittest.cc",
     "//brave/chromium_src/chrome/browser/signin/account_consistency_disabled_unittest.cc",
     "//brave\chromium_src/chrome/browser/ui/bookmarks/brave_bookmark_context_menu_controller_unittest.cc",
     "//brave/chromium_src/components/search_engines/brave_template_url_prepopulate_data_unittest.cc",