From e719c5eec1cac1f06bce7ff4ea0cecf436378ba8 Mon Sep 17 00:00:00 2001
From: Deep <deeppandya91@gmail.com>
Date: Tue, 9 Mar 2021 12:51:34 -0500
Subject: [PATCH] Address PR comments

---
 android/java/apk_for_test.flags                            | 4 ++++
 .../settings/BraveStandardProtectionSettingsFragment.java  | 7 ++++---
 .../org/chromium/chrome/browser/BytecodeTest.java          | 5 +++++
 ...raveStandardProtectionSettingsFragmentClassAdapter.java | 2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags
index 2e27393d39d..687604b497e 100644
--- a/android/java/apk_for_test.flags
+++ b/android/java/apk_for_test.flags
@@ -205,3 +205,7 @@
 -keep class org.chromium.chrome.browser.customtabs.CustomTabAppMenuPropertiesDelegate {
     public <init>(...);
 }
+
+-keep class org.chromium.chrome.browser.safe_browsing.settings.BraveStandardProtectionSettingsFragment {
+    *** updateLeakDetectionAndExtendedReportingPreferences(...);
+}
diff --git a/android/java/org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment.java b/android/java/org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment.java
index 16734d7e53d..aee1e89e6f0 100644
--- a/android/java/org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment.java
+++ b/android/java/org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment.java
@@ -1,6 +1,7 @@
-// Copyright 2021 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 package org.chromium.chrome.browser.safe_browsing.settings;
 
diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
index 5d8c1afc6f8..4a448de11f2 100644
--- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
+++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java
@@ -106,6 +106,8 @@ public class BytecodeTest {
         Assert.assertTrue(classExists("org/chromium/chrome/browser/bookmarks/BraveBookmarkUtils"));
         Assert.assertTrue(classExists(
                 "org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment"));
+        Assert.assertTrue(classExists(
+                "org/chromium/chrome/browser/safe_browsing/settings/StandardProtectionSettingsFragment"));
         Assert.assertTrue(
                 classExists("org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator"));
         Assert.assertTrue(classExists(
@@ -207,6 +209,9 @@ public class BytecodeTest {
                 List.class));
         Assert.assertTrue(methodExists("org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout",
                 "getBoundsAfterAccountingForRightButtons", true, int.class, ViewGroup.class));
+        Assert.assertTrue(methodExists(
+                "org/chromium/chrome/browser/safe_browsing/settings/BraveStandardProtectionSettingsFragment",
+                "updateLeakDetectionAndExtendedReportingPreferences", true, void.class));
 
         // NOTE: Add new checks above. For each new check in this method add proguard exception in
         // `brave/android/java/proguard.flags` file under `Add methods for invocation below`
diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveStandardProtectionSettingsFragmentClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveStandardProtectionSettingsFragmentClassAdapter.java
index 0590f373bed..7c4f2545916 100644
--- a/build/android/bytecode/java/org/brave/bytecode/BraveStandardProtectionSettingsFragmentClassAdapter.java
+++ b/build/android/bytecode/java/org/brave/bytecode/BraveStandardProtectionSettingsFragmentClassAdapter.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2020 The Brave Authors. All rights reserved.
+/* Copyright (c) 2021 The Brave Authors. All rights reserved.
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */