Remove unused parameter from PrefServiceBridgeJni

The PrefServiceBridge Java caller object is not used on the native side
remove it from all calls.

Bug: 1016957
Change-Id: I3987dd419723fd9a11f00c93fa45a8e738574a88
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1894268Reviewed-by: Patrick Noland <pnoland@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711817}

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ContentSettingException.java

@@ -9,7 +9,6 @@ import androidx.annotation.Nullable;
 
 import org.chromium.chrome.browser.ContentSettingsType;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
-import org.chromium.chrome.browser.preferences.PrefServiceBridgeJni;
 
 import java.io.Serializable;
 import java.lang.annotation.Retention;
@@ -81,8 +80,8 @@ public class ContentSettingException implements Serializable {
      * Sets the content setting value for this exception.
      */
     public void setContentSetting(@ContentSettingValues @Nullable Integer value) {
-        PrefServiceBridgeJni.get().setContentSettingForPattern(
-                PrefServiceBridge.getInstance(), mContentSettingType, mPattern, value);
+        PrefServiceBridge.getInstance().setContentSettingForPattern(
+                mContentSettingType, mPattern, value);
     }
 
     public static @ContentSettingsType int getContentSettingsType(@Type int type) {

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SingleCategoryPreferences.java

@@ -50,7 +50,6 @@ import org.chromium.chrome.browser.preferences.ManagedPreferenceDelegate;
 import org.chromium.chrome.browser.preferences.ManagedPreferencesUtils;
 import org.chromium.chrome.browser.preferences.Pref;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
-import org.chromium.chrome.browser.preferences.PrefServiceBridgeJni;
 import org.chromium.chrome.browser.preferences.PreferenceUtils;
 import org.chromium.chrome.browser.preferences.SearchUtils;
 import org.chromium.chrome.browser.preferences.website.Website.StoredDataClearedCallback;
@@ -586,7 +585,7 @@ public class SingleCategoryPreferences extends PreferenceFragmentCompat
                 ? ContentSettingValues.BLOCK
                 : ContentSettingValues.ALLOW;
 
-        PrefServiceBridgeJni.get().setContentSettingForPattern(PrefServiceBridge.getInstance(),
+        PrefServiceBridge.getInstance().setContentSettingForPattern(
                 mCategory.getContentSettingsType(), hostname, setting);
         Toast.makeText(getActivity(),
                 String.format(getActivity().getString(

chrome/android/junit/src/org/chromium/chrome/browser/preferences/PrefServiceBridgeTest.java

@@ -44,7 +44,7 @@ public class PrefServiceBridgeTest {
         boolean expected = false;
 
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
-        doReturn(expected).when(mNativeMock).getBoolean(prefServiceBridge, PREF);
+        doReturn(expected).when(mNativeMock).getBoolean(PREF);
 
         assertEquals(expected, prefServiceBridge.getBoolean(PREF));
     }
@@ -56,7 +56,7 @@ public class PrefServiceBridgeTest {
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
         prefServiceBridge.setBoolean(PREF, value);
 
-        verify(mNativeMock).setBoolean(eq(prefServiceBridge), eq(PREF), eq(value));
+        verify(mNativeMock).setBoolean(eq(PREF), eq(value));
     }
 
     @Test
@@ -64,7 +64,7 @@ public class PrefServiceBridgeTest {
         int expected = 26;
 
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
-        doReturn(expected).when(mNativeMock).getInteger(prefServiceBridge, PREF);
+        doReturn(expected).when(mNativeMock).getInteger(PREF);
 
         assertEquals(expected, prefServiceBridge.getInteger(PREF));
     }
@@ -76,7 +76,7 @@ public class PrefServiceBridgeTest {
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
         prefServiceBridge.setInteger(PREF, value);
 
-        verify(mNativeMock).setInteger(eq(prefServiceBridge), eq(PREF), eq(value));
+        verify(mNativeMock).setInteger(eq(PREF), eq(value));
     }
 
     @Test
@@ -84,7 +84,7 @@ public class PrefServiceBridgeTest {
         String expected = "foo";
 
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
-        doReturn(expected).when(mNativeMock).getString(prefServiceBridge, PREF);
+        doReturn(expected).when(mNativeMock).getString(PREF);
 
         assertEquals(expected, prefServiceBridge.getString(PREF));
     }
@@ -96,7 +96,7 @@ public class PrefServiceBridgeTest {
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
         prefServiceBridge.setString(PREF, value);
 
-        verify(mNativeMock).setString(eq(prefServiceBridge), eq(PREF), eq(value));
+        verify(mNativeMock).setString(eq(PREF), eq(value));
     }
 
     @Test
@@ -104,7 +104,7 @@ public class PrefServiceBridgeTest {
         boolean expected = true;
 
         PrefServiceBridge prefServiceBridge = new PrefServiceBridge();
-        doReturn(expected).when(mNativeMock).isManagedPreference(prefServiceBridge, PREF);
+        doReturn(expected).when(mNativeMock).isManagedPreference(PREF);
 
         assertEquals(expected, prefServiceBridge.isManagedPreference(PREF));
     }