Add launchSettingsPage for top-level Settings

Add another launchSettingsPage method for launching the top-level
Settings page, rather than relying on caller to pass null.

Change-Id: I144549cb237ef15073146d4881f711971aba6a0d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2013343Reviewed-by: Sky Malice <skym@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Commit-Queue: Natalie Chouinard <chouinard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#733814}

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -2002,7 +2002,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
         }
 
         if (id == R.id.preferences_id) {
-            SettingsLauncher.getInstance().launchSettingsPage(this, null);
+            SettingsLauncher.getInstance().launchSettingsPage(this);
             RecordUserAction.record("MobileMenuSettings");
         }
 

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.java

@@ -42,7 +42,6 @@ import org.chromium.chrome.browser.payments.ui.PaymentRequestUI;
 import org.chromium.chrome.browser.payments.ui.SectionInformation;
 import org.chromium.chrome.browser.payments.ui.ShoppingCart;
 import org.chromium.chrome.browser.profiles.Profile;
-import org.chromium.chrome.browser.settings.MainPreferences;
 import org.chromium.chrome.browser.settings.SettingsLauncher;
 import org.chromium.chrome.browser.ssl.SecurityStateModel;
 import org.chromium.chrome.browser.tab.Tab;
@@ -2282,7 +2281,7 @@ public class PaymentRequestImpl
             return;
         }
 
-        SettingsLauncher.getInstance().launchSettingsPage(context, MainPreferences.class);
+        SettingsLauncher.getInstance().launchSettingsPage(context);
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/settings/SettingsLauncher.java

@@ -37,6 +37,15 @@ public class SettingsLauncher {
         sInstanceForTests = getter;
     }
 
+    /**
+     * Launches the top-level settings page.
+     *
+     * @param context The current Activity, or an application context if no Activity is available.
+     */
+    public void launchSettingsPage(Context context) {
+        launchSettingsPage(context, null);
+    }
+
     /**
      * Launches settings, either on the top-level page or on a subpage.
      *

chrome/android/java/src/org/chromium/chrome/browser/sharing/shared_clipboard/SharedClipboardShareActivity.java

@@ -79,7 +79,7 @@ public class SharedClipboardShareActivity
             chromeSettingsButton.setVisibility(View.VISIBLE);
             chromeSettingsButton.setOnClickListener(view -> {
                 SettingsLauncher.getInstance().launchSettingsPage(
-                        ContextUtils.getApplicationContext(), null);
+                        ContextUtils.getApplicationContext());
             });
         }
 

chrome/android/javatests/src/org/chromium/chrome/browser/vr/VrBrowserTransitionTest.java

@@ -394,7 +394,7 @@ public class VrBrowserTransitionTest {
         VrShellDelegateUtils.getDelegateInstance().overrideDaydreamApiForTesting(mockApiWithDoff);
 
         TestThreadUtils.runOnUiThreadBlocking(() -> {
-            SettingsLauncher.getInstance().launchSettingsPage(context, null);
+            SettingsLauncher.getInstance().launchSettingsPage(context);
             VrShellDelegateUtils.getDelegateInstance().acceptDoffPromptForTesting();
         });
         CriteriaHelper.pollUiThread(() -> {