Android: Fix ErrorProne warnings from calling statics via instances

TBR=agrieve  # ErrorProne fixes.

Bug: 894616
Change-Id: Ib1ad6130ce52c3f939423de99840e1e1977cf50a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1933470
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718663}

chrome/android/features/autofill_assistant/javatests/src/org/chromium/chrome/browser/autofill_assistant/AutofillAssistantCollectUserDataTestHelper.java

@@ -165,7 +165,7 @@ public class AutofillAssistantCollectUserDataTestHelper {
 
     void setRequestTimeoutForTesting() {
         TestThreadUtils.runOnUiThreadBlocking(
-                () -> PersonalDataManager.getInstance().setRequestTimeoutForTesting(0));
+                () -> PersonalDataManager.setRequestTimeoutForTesting(0));
     }
 
     void setSyncServiceForTesting() {

chrome/android/java/src/org/chromium/chrome/browser/download/DownloadInfoBarController.java

@@ -940,7 +940,7 @@ public class DownloadInfoBarController implements OfflineContentProvider.Observe
                 DownloadUtils.openItem(
                         itemId, mIsIncognito, DownloadOpenSource.DOWNLOAD_PROGRESS_INFO_BAR);
             } else {
-                DownloadManagerService.getDownloadManagerService().openDownloadsPage(
+                DownloadManagerService.openDownloadsPage(
                         getContext(), DownloadOpenSource.DOWNLOAD_PROGRESS_INFO_BAR);
             }
             recordLinkClicked(itemId != null);

chrome/android/java/src/org/chromium/chrome/browser/infobar/DuplicateDownloadInfoBar.java

@@ -156,7 +156,7 @@ public class DuplicateDownloadInfoBar extends ConfirmInfoBar {
      * @return Possible mime type of the file.
      */
     private static String getMimeTypeFromUri(Uri fileUri) {
-        String extension = MimeTypeMap.getSingleton().getFileExtensionFromUrl(fileUri.toString());
+        String extension = MimeTypeMap.getFileExtensionFromUrl(fileUri.toString());
         return MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
     }
 

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

@@ -474,7 +474,7 @@ public class AddressEditor
         // For tests, the time-out is set to 0. In this case, we should not
         // fetch the admin-areas, and show a text-field instead.
         // This is to have the tests independent of the network status.
-        if (PersonalDataManager.getInstance().getRequestTimeoutMS() == 0) {
+        if (PersonalDataManager.getRequestTimeoutMS() == 0) {
             onSubKeysReceived(null, null);
             return;
         }

chrome/android/java/src/org/chromium/chrome/browser/preferences/languages/LanguagesPreferences.java

@@ -4,6 +4,7 @@
 
 package org.chromium.chrome.browser.preferences.languages;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.preference.Preference;
@@ -70,7 +71,7 @@ public class LanguagesPreferences
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
-        if (requestCode == REQUEST_CODE_ADD_LANGUAGES && resultCode == getActivity().RESULT_OK) {
+        if (requestCode == REQUEST_CODE_ADD_LANGUAGES && resultCode == Activity.RESULT_OK) {
             String code = data.getStringExtra(AddLanguageFragment.INTENT_NEW_ACCEPT_LANGUAGE);
             LanguagesManager.getInstance().addToAcceptLanguages(code);
             LanguagesManager.recordAction(

chrome/android/java/src/org/chromium/chrome/browser/preferences/password/PasswordReauthenticationFragment.java

@@ -5,6 +5,7 @@
 package org.chromium.chrome.browser.preferences.password;
 
 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.app.KeyguardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -63,7 +64,7 @@ public class PasswordReauthenticationFragment extends Fragment {
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         if (requestCode == CONFIRM_DEVICE_CREDENTIAL_REQUEST_CODE) {
-            if (resultCode == getActivity().RESULT_OK) {
+            if (resultCode == Activity.RESULT_OK) {
                 ReauthenticationManager.recordLastReauth(
                         System.currentTimeMillis(), getArguments().getInt(SCOPE_ID));
             } else {

chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java

@@ -40,6 +40,7 @@ import org.chromium.base.test.util.Restriction;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.base.test.util.UrlUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.compositor.animation.CompositorAnimationHandler;
 import org.chromium.chrome.browser.compositor.layouts.Layout;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.compositor.layouts.LayoutManagerChrome;
@@ -167,8 +168,7 @@ public class TabsTest {
             return;
         }
         mActivityTestRule.startMainActivityOnBlankPage();
-        mActivityTestRule.getActivity().getLayoutManager().getAnimationHandler().setTestingMode(
-                true);
+        CompositorAnimationHandler.setTestingMode(true);
     }
 
     @After

chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java

@@ -27,7 +27,7 @@ public class AutofillTestHelper {
 
     void setRequestTimeoutForTesting() {
         TestThreadUtils.runOnUiThreadBlocking(
-                () -> PersonalDataManager.getInstance().setRequestTimeoutForTesting(0));
+                () -> PersonalDataManager.setRequestTimeoutForTesting(0));
     }
 
     void setSyncServiceForTesting() {

chrome/android/javatests/src/org/chromium/chrome/browser/compositor/layouts/LayoutManagerTest.java

@@ -27,6 +27,7 @@ import org.junit.runner.RunWith;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.browser.compositor.animation.CompositorAnimationHandler;
 import org.chromium.chrome.browser.compositor.layouts.components.LayoutTab;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.EdgeSwipeHandler;
 import org.chromium.chrome.browser.compositor.layouts.eventfilter.ScrollDirection;
@@ -135,7 +136,7 @@ public class LayoutManagerTest implements MockTabModelDelegate {
 
         mManagerPhone = new LayoutManagerChromePhone(layoutManagerHost, null);
         mManager = mManagerPhone;
-        mManager.getAnimationHandler().setTestingMode(true);
+        CompositorAnimationHandler.setTestingMode(true);
         mManager.init(mTabModelSelector, null, null, container, null, null);
         initializeMotionEvent();
     }

chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java

@@ -53,6 +53,7 @@ import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.ChromeSwitches;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.ChromeTabbedActivity2;
+import org.chromium.chrome.browser.compositor.animation.CompositorAnimationHandler;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayContentDelegate;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayContentProgressObserver;
 import org.chromium.chrome.browser.compositor.bottombar.OverlayPanel.PanelState;
@@ -2793,7 +2794,7 @@ public class ContextualSearchManagerTest {
     @SmallTest
     @Feature({"ContextualSearch"})
     public void testQuickActionCaptionAndImage() throws InterruptedException, TimeoutException {
-        mPanel.getAnimationHandler().setTestingMode(true);
+        CompositorAnimationHandler.setTestingMode(true);
 
         // Simulate a tap to show the Bar, then set the quick action data.
         simulateTapSearch("search");

chrome/android/javatests/src/org/chromium/chrome/browser/gesturenav/NavigationHandlerTest.java

@@ -23,6 +23,7 @@ import org.chromium.base.ApplicationStatus;
 import org.chromium.base.test.util.CommandLineFlags;
 import org.chromium.base.test.util.RetryOnFailure;
 import org.chromium.chrome.browser.ChromeSwitches;
+import org.chromium.chrome.browser.compositor.animation.CompositorAnimationHandler;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.util.UrlConstants;
 import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
@@ -55,8 +56,7 @@ public class NavigationHandlerTest {
     @Before
     public void setUp() throws InterruptedException {
         mActivityTestRule.startMainActivityOnBlankPage();
-        mActivityTestRule.getActivity().getLayoutManager().getAnimationHandler().setTestingMode(
-                true);
+        CompositorAnimationHandler.setTestingMode(true);
         DisplayMetrics displayMetrics = new DisplayMetrics();
         mActivityTestRule.getActivity().getWindowManager().getDefaultDisplay().getMetrics(
                 displayMetrics);

chrome/android/junit/src/org/chromium/chrome/browser/webapps/WebappDirectoryManagerTest.java

@@ -107,7 +107,7 @@ public class WebappDirectoryManagerTest {
                     @Override
                     public void onWebappDataStorageRetrieved(WebappDataStorage storage) {}
                 });
-        ShadowApplication.getInstance().runBackgroundTasks();
+        ShadowApplication.runBackgroundTasks();
     }
 
     @Test

chrome/browser/download/android/java/src/org/chromium/chrome/browser/download/DownloadFileProvider.java

@@ -197,7 +197,7 @@ public class DownloadFileProvider extends FileProvider {
     }
 
     private static String getMimeTypeFromUri(Uri fileUri) {
-        String extension = MimeTypeMap.getSingleton().getFileExtensionFromUrl(fileUri.toString());
+        String extension = MimeTypeMap.getFileExtensionFromUrl(fileUri.toString());
         return MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
     }