[WebLayer] Move site settings HelpAndFeedback calls behind SiteSettingsClient

This CL removes direct dependencies on HelpAndFeedback from the Site
Settings UI, which is in the process of being componentized so it can be
reused by WebLayer. The existing help logic is moved to
ChromeSiteSettingsClient, since it contains Chrome-specific URLs and
logic.

Bug: 1058597
Change-Id: Id676437e447377e19f062ee5d1524bd2de0511d3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2128369Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Commit-Queue: Robbie McElrath <rmcelrath@chromium.org>
Cr-Commit-Position: refs/heads/master@{#755139}

chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChosenObjectSettings.java

@@ -22,8 +22,6 @@ import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
 
 import org.chromium.base.annotations.RemovableInRelease;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.help.HelpAndFeedback;
-import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.components.browser_ui.settings.ChromeImageViewPreference;
 import org.chromium.components.browser_ui.settings.ManagedPreferencesUtils;
 
@@ -129,9 +127,8 @@ public class ChosenObjectSettings extends SiteSettingsPreferenceFragment {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         if (item.getItemId() == R.id.menu_id_targeted_help) {
-            HelpAndFeedback.getInstance().show(getActivity(),
-                    getString(R.string.help_context_settings), Profile.getLastUsedRegularProfile(),
-                    null);
+            getSiteSettingsClient().launchHelpAndFeedbackActivity(
+                    getActivity(), getString(R.string.help_context_settings));
             return true;
         }
         return false;

chrome/android/java/src/org/chromium/chrome/browser/site_settings/ChromeSiteSettingsClient.java

@@ -4,8 +4,12 @@
 
 package org.chromium.chrome.browser.site_settings;
 
+import android.app.Activity;
+
 import androidx.preference.Preference;
 
+import org.chromium.chrome.browser.help.HelpAndFeedback;
+import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate;
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
@@ -27,4 +31,10 @@ public class ChromeSiteSettingsClient implements SiteSettingsClient {
         }
         return mManagedPreferenceDelegate;
     }
+
+    @Override
+    public void launchHelpAndFeedbackActivity(Activity currentActivity, String helpContext) {
+        HelpAndFeedback.getInstance().show(
+                currentActivity, helpContext, Profile.getLastUsedRegularProfile(), null);
+    }
 }

chrome/android/java/src/org/chromium/chrome/browser/site_settings/SingleCategorySettings.java

@@ -39,10 +39,8 @@ import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.browserservices.permissiondelegation.TrustedWebActivityPermissionManager;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
-import org.chromium.chrome.browser.help.HelpAndFeedback;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
-import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.site_settings.FourStateCookieSettingsPreference.CookieSettingsState;
 import org.chromium.chrome.browser.site_settings.Website.StoredDataClearedCallback;
 import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference;
@@ -417,8 +415,8 @@ public class SingleCategorySettings extends SiteSettingsPreferenceFragment
             if (mCategory.showSites(SiteSettingsCategory.Type.PROTECTED_MEDIA)) {
                 helpContextResId = R.string.help_context_protected_content;
             }
-            HelpAndFeedback.getInstance().show(getActivity(), getString(helpContextResId),
-                    Profile.getLastUsedRegularProfile(), null);
+            getSiteSettingsClient().launchHelpAndFeedbackActivity(
+                    getActivity(), getString(helpContextResId));
             return true;
         }
         if (handleSearchNavigation(item, mSearchItem, mSearch, getActivity())) {

chrome/android/java/src/org/chromium/chrome/browser/site_settings/SiteSettingsClient.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.site_settings;
 
+import android.app.Activity;
+
 import org.chromium.components.browser_ui.settings.ManagedPreferenceDelegate;
 
 /**
@@ -16,4 +18,9 @@ public interface SiteSettingsClient {
      *         Preferences.
      */
     ManagedPreferenceDelegate getManagedPreferenceDelegate();
+
+    /**
+     * @see org.chromium.chrome.browser.help.HelpAndFeedback#show
+     */
+    void launchHelpAndFeedbackActivity(Activity currentActivity, String helpContext);
 }