Android: Fix many VisibleForTests lint warnings

And one SupportAnnotationUsage misplaced annotation.

Tbr: Just removing/moving annotations to be more correct.
Bug: 1116130
Change-Id: I88c2e0df485a8fc263ac4958cc72ee171741fa85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367636
Commit-Queue: Peter Wen <wnwen@chromium.org>
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800329}

android_webview/java/src/org/chromium/android_webview/AwContentsClientCallbackHelper.java

@@ -10,8 +10,6 @@ import android.os.Looper;
 import android.os.Message;
 import android.os.SystemClock;
 
-import androidx.annotation.VisibleForTesting;
-
 import org.chromium.android_webview.safe_browsing.AwSafeBrowsingResponse;
 import org.chromium.base.Callback;
 
@@ -23,7 +21,6 @@ import java.util.concurrent.Callable;
  * Most callbacks do no go through here, but get forwarded to AwContentsClient directly. The
  * messages processed here may originate from the IO or UI thread.
  */
-@VisibleForTesting
 public class AwContentsClientCallbackHelper {
     /**
      * Interface to tell CallbackHelper to cancel posted callbacks.

android_webview/java/src/org/chromium/android_webview/AwScrollOffsetManager.java

@@ -6,15 +6,12 @@ package org.chromium.android_webview;
 
 import android.graphics.Rect;
 
-import androidx.annotation.VisibleForTesting;
-
 /**
  * Takes care of syncing the scroll offset between the Android View system and the
  * InProcessViewRenderer.
  *
  * Unless otherwise values (sizes, scroll offsets) are in physical pixels.
  */
-@VisibleForTesting
 public class AwScrollOffsetManager {
     // Values taken from WebViewClassic.
 

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/details/AssistantDetailsModel.java

@@ -17,7 +17,7 @@ import org.chromium.ui.modelutil.PropertyModel;
 public class AssistantDetailsModel extends PropertyModel {
     // TODO(crbug.com/806868): We might want to split this property into multiple, simpler
     // properties.
-    @VisibleForTesting
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     public static final WritableObjectPropertyKey<AssistantDetails> DETAILS =
             new WritableObjectPropertyKey<>();
 

chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/infobox/AssistantInfoBoxModel.java

@@ -15,7 +15,7 @@ import org.chromium.ui.modelutil.PropertyModel;
  */
 @JNINamespace("autofill_assistant")
 public class AssistantInfoBoxModel extends PropertyModel {
-    @VisibleForTesting
+    @VisibleForTesting(otherwise = VisibleForTesting.PACKAGE_PRIVATE)
     public static final WritableObjectPropertyKey<AssistantInfoBox> INFO_BOX =
             new WritableObjectPropertyKey<>();
 

chrome/android/features/keyboard_accessory/internal/java/src/org/chromium/chrome/browser/keyboard_accessory/bar_component/KeyboardAccessoryProperties.java

@@ -6,7 +6,6 @@ package org.chromium.chrome.browser.keyboard_accessory.bar_component;
 
 import androidx.annotation.IntDef;
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.tabs.TabLayout;
@@ -47,7 +46,6 @@ class KeyboardAccessoryProperties {
             new WritableObjectPropertyKey<>("tab_layout_item");
     static final WritableObjectPropertyKey<Runnable> SHOW_KEYBOARD_CALLBACK =
             new WritableObjectPropertyKey<>("keyboard_callback");
-    @VisibleForTesting
     static final ReadableBooleanPropertyKey DISABLE_ANIMATIONS_FOR_TESTING =
             new WritableBooleanPropertyKey("skip_all_animations_for_testing");
 

chrome/android/features/media_router/java/src/org/chromium/chrome/browser/media/router/ChromeMediaRouter.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.media.router;
 
+import android.annotation.SuppressLint;
+
 import androidx.annotation.Nullable;
 import androidx.annotation.VisibleForTesting;
 import androidx.mediarouter.media.MediaRouter;
@@ -67,6 +69,7 @@ public class ChromeMediaRouter implements MediaRouteManager {
     private final Map<String, List<MediaSink>> mSinksPerSource =
             new HashMap<String, List<MediaSink>>();
     private static boolean sAndroidMediaRouterSetForTest;
+    @SuppressLint("StaticFieldLeak") // This is for test only.
     private static MediaRouter sAndroidMediaRouterForTest;
 
     @VisibleForTesting

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

@@ -278,7 +278,6 @@ public class PersonalDataManager {
             return mIsLocal;
         }
 
-        @VisibleForTesting
         public void setGUID(String guid) {
             mGUID = guid;
         }
@@ -299,7 +298,6 @@ public class PersonalDataManager {
             mCompanyName = companyName;
         }
 
-        @VisibleForTesting
         public void setStreetAddress(String streetAddress) {
             mStreetAddress = streetAddress;
         }
@@ -324,7 +322,6 @@ public class PersonalDataManager {
             mSortingCode = sortingCode;
         }
 
-        @VisibleForTesting
         public void setCountryCode(String countryCode) {
             mCountryCode = countryCode;
         }
@@ -337,7 +334,6 @@ public class PersonalDataManager {
             mEmailAddress = emailAddress;
         }
 
-        @VisibleForTesting
         public void setLanguageCode(String languageCode) {
             mLanguageCode = languageCode;
         }
@@ -512,7 +508,6 @@ public class PersonalDataManager {
             return mNickname;
         }
 
-        @VisibleForTesting
         public void setGUID(String guid) {
             mGUID = guid;
         }
@@ -525,7 +520,6 @@ public class PersonalDataManager {
             mName = name;
         }
 
-        @VisibleForTesting
         public void setNumber(String number) {
             mNumber = number;
         }
@@ -534,7 +528,6 @@ public class PersonalDataManager {
             mObfuscatedNumber = obfuscatedNumber;
         }
 
-        @VisibleForTesting
         public void setMonth(String month) {
             mMonth = month;
         }

chrome/android/java/src/org/chromium/chrome/browser/contextualsearch/ResolvedSearchTerm.java

@@ -276,8 +276,8 @@ public class ResolvedSearchTerm {
         private String mContextLanguage;
         private String mThumbnailUrl;
         private String mCaption;
-        @QuickActionCategory
         private String mQuickActionUri;
+        @QuickActionCategory
         private int mQuickActionCategory;
         private long mLoggedEventId;
         private String mSearchUrlFull;

chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/OmniboxSuggestion.java

@@ -7,7 +7,6 @@ package org.chromium.chrome.browser.omnibox.suggestions;
 import android.text.TextUtils;
 
 import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
 import androidx.core.util.ObjectsCompat;
 
 import org.chromium.chrome.browser.omnibox.MatchClassificationStyle;
@@ -21,7 +20,6 @@ import java.util.List;
 /**
  * Container class with information about each omnibox suggestion item.
  */
-@VisibleForTesting
 public class OmniboxSuggestion {
     public static final int INVALID_GROUP = -1;
     public static final int INVALID_TYPE = -1;

chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java

@@ -137,7 +137,6 @@ public class AndroidSyncSettings {
      *
      * @return true if sync is on, false otherwise
      */
-    @VisibleForTesting
     public boolean isChromeSyncEnabled() {
         return mChromeSyncEnabled;
     }

chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarLayout.java

@@ -442,7 +442,6 @@ public abstract class ToolbarLayout
     /**
      * @return The provider for toolbar related data.
      */
-    @VisibleForTesting
     public ToolbarDataProvider getToolbarDataProvider() {
         return mToolbarDataProvider;
     }

chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/Snackbar.java

@@ -221,7 +221,6 @@ public class Snackbar {
     /**
      * @return The {@link SnackbarController} that controls this snackbar.
      */
-    @VisibleForTesting
     public SnackbarController getController() {
         return mController;
     }

components/background_task_scheduler/android/java/src/org/chromium/components/background_task_scheduler/NativeBackgroundTask.java

@@ -7,7 +7,6 @@ package org.chromium.components.background_task_scheduler;
 import android.content.Context;
 
 import androidx.annotation.IntDef;
-import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.task.PostTask;
@@ -233,7 +232,6 @@ public abstract class NativeBackgroundTask implements BackgroundTask {
         return getBrowserStartupController().isRunningInServiceManagerMode();
     }
 
-    @VisibleForTesting
     protected BrowserStartupController getBrowserStartupController() {
         return BrowserStartupController.getInstance();
     }

components/background_task_scheduler/internal/android/java/src/org/chromium/components/background_task_scheduler/internal/BackgroundTaskSchedulerDelegate.java

@@ -6,8 +6,6 @@ package org.chromium.components.background_task_scheduler.internal;
 
 import android.content.Context;
 
-import androidx.annotation.VisibleForTesting;
-
 import org.chromium.components.background_task_scheduler.TaskInfo;
 
 /**
@@ -16,17 +14,11 @@ import org.chromium.components.background_task_scheduler.TaskInfo;
  * ({@link com.google.android.gms.gcm.GcmNetworkManager}) on older platforms.
  */
 interface BackgroundTaskSchedulerDelegate {
-    @VisibleForTesting
     String BACKGROUND_TASK_ID_KEY = "_background_task_id";
-    @VisibleForTesting
     String BACKGROUND_TASK_EXTRAS_KEY = "_background_task_extras";
-    @VisibleForTesting
     String BACKGROUND_TASK_SCHEDULE_TIME_KEY = "_background_task_schedule_time";
-    @VisibleForTesting
     String BACKGROUND_TASK_END_TIME_KEY = "_background_task_end_time";
-    @VisibleForTesting
     String BACKGROUND_TASK_INTERVAL_TIME_KEY = "_background_task_interval_time";
-    @VisibleForTesting
     String BACKGROUND_TASK_FLEX_TIME_KEY = "_background_task_flex_time";
 
     /**

components/embedder_support/android/java/src/org/chromium/components/embedder_support/util/UrlUtilities.java

@@ -8,7 +8,6 @@ import android.net.Uri;
 import android.text.TextUtils;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.VisibleForTesting;
 
 import org.chromium.base.CollectionUtil;
 import org.chromium.base.annotations.JNINamespace;
@@ -158,20 +157,17 @@ public class UrlUtilities {
     }
 
     /** Returns whether a URL is within another URL's scope. */
-    @VisibleForTesting
     public static boolean isUrlWithinScope(String url, String scopeUrl) {
         return UrlUtilitiesJni.get().isUrlWithinScope(url, scopeUrl);
     }
 
     /** @return whether two URLs match, ignoring the #fragment. */
-    @VisibleForTesting
     public static boolean urlsMatchIgnoringFragments(String url, String url2) {
         if (TextUtils.equals(url, url2)) return true;
         return UrlUtilitiesJni.get().urlsMatchIgnoringFragments(url, url2);
     }
 
     /** @return whether the #fragmant differs in two URLs. */
-    @VisibleForTesting
     public static boolean urlsFragmentsDiffer(String url, String url2) {
         if (TextUtils.equals(url, url2)) return false;
         return UrlUtilitiesJni.get().urlsFragmentsDiffer(url, url2);