Android: Enable new Error Prone checks: IntLiteralCast, UnnecessaryStringBuilder

Bug: None
Change-Id: I695a463009ee02c6c5a77b769672cfe3767b32bf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6506169
Reviewed-by: Peter Wen <wnwen@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1455154}

build/android/gyp/errorprone.py

@@ -13,6 +13,7 @@ from util import server_utils
 
 # Add a check here to cause the suggested fix to be applied while compiling.
 # Use this when trying to enable more checks.
+# BE SURE TO BUILD WITH --offline
 ERRORPRONE_CHECKS_TO_APPLY = []
 
 # Checks to disable in tests.
@@ -27,9 +28,6 @@ TESTONLY_ERRORPRONE_WARNINGS_TO_DISABLE = [
 ERRORPRONE_WARNINGS_TO_DISABLE = [
     'InlineMeInliner',
     'InlineMeSuggester',
-    'UnnecessaryAssignment',
-    'IntLiteralCast',
-    'UnnecessaryStringBuilder',
     # High priority to enable:
     'HidingField',
     'AlreadyChecked',
@@ -122,6 +120,9 @@ ERRORPRONE_WARNINGS_TO_DISABLE = [
     'RedundantControlFlow',
     # Low priority.
     'StatementSwitchToExpressionSwitch',
+    # Assigning to fields marked as @Mock or @Spy. Suggested fix is to delete
+    # assignments, which would break tests in many cases.
+    'UnnecessaryAssignment',
 ]
 
 # Full list of checks: https://errorprone.info/bugpatterns

chrome/browser/collaboration/android/java/src/org/chromium/chrome/browser/collaboration/CollaborationControllerDelegateImplUnitTest.java

@@ -112,9 +112,7 @@ public class CollaborationControllerDelegateImplUnitTest {
                 .getServiceStatus();
         doReturn(mSigninManager).when(mIdentityServicesProvider).getSigninManager(mProfile);
         doReturn(true).when(mSigninManager).isSigninAllowed();
-        doReturn((long) 0)
-                .when(mCollaborationControllerDelegateImplNativeMock)
-                .createNativeObject(any());
+        doReturn(0L).when(mCollaborationControllerDelegateImplNativeMock).createNativeObject(any());
         mActivityScenarioRule.getScenario().onActivity(this::onActivityCreated);
         doReturn(mProfile).when(mDataSharingTabManager).getProfile();
         doReturn(mWindowAndroid).when(mDataSharingTabManager).getWindowAndroid();

chrome/browser/tab_group_sync/android/java/src/org/chromium/chrome/browser/tab_group_sync/TabGroupSyncLocalObserver.java

@@ -287,11 +287,11 @@ public final class TabGroupSyncLocalObserver {
             @Override
             public void willCloseTabGroup(Token tabGroupId, boolean isHiding) {
                 if (!mIsObserving) return;
-                StringBuilder builder =
-                        new StringBuilder("willCloseTabGroup, tabGroupId = ")
-                                .append(tabGroupId)
-                                .append(" wasHiding = ")
-                                .append(isHiding);
+                String builder =
+                        "willCloseTabGroup, tabGroupId = "
+                                + tabGroupId
+                                + " wasHiding = "
+                                + isHiding;
                 LogUtils.log(TAG, builder.toString());
 
                 mRemoteTabGroupMutationHelper.handleWillCloseTabGroup(

chrome/browser/ui/android/google_bottom_bar/java/src/org/chromium/chrome/browser/ui/google_bottom_bar/GoogleBottomBarViewCreatorTest.java

@@ -621,7 +621,7 @@ public class GoogleBottomBarViewCreatorTest {
         mGoogleBottomBarViewCreator = getGoogleBottomBarViewCreator(bottomBarConfig);
 
         assertEquals(
-                ViewUtils.dpToPx(mActivity, (float) 123),
+                ViewUtils.dpToPx(mActivity, 123.0f),
                 mGoogleBottomBarViewCreator.getBottomBarHeightInPx());
     }
 

components/media_router/browser/android/junit/src/org/chromium/components/media_router/caf/CafMessageHandlerTest.java

@@ -415,12 +415,9 @@ public class CafMessageHandlerTest {
         JSONObject innerMessage =
                 new JSONObject()
                         .put("type", "SET_VOLUME")
-                        .put(
-                                "volume",
-                                new JSONObject().put("level", (double) 1).put("muted", false));
+                        .put("volume", new JSONObject().put("level", 1.0).put("muted", false));
         JSONObject message = buildCastV2Message(CLIENT_ID1, innerMessage);
         assertTrue(mMessageHandler.handleMessageFromClient(message.toString()));
-        JSONObject volumeMessage = innerMessage.getJSONObject("volume");
         verify(mSession).setMute(false);
         verify(mSession).setVolume(1.0);
         verify(mMessageHandler)
@@ -438,12 +435,9 @@ public class CafMessageHandlerTest {
         JSONObject innerMessage =
                 new JSONObject()
                         .put("type", "SET_VOLUME")
-                        .put(
-                                "volume",
-                                new JSONObject().put("level", (double) 1).put("muted", false));
+                        .put("volume", new JSONObject().put("level", 1.0).put("muted", false));
         JSONObject message = buildCastV2Message(CLIENT_ID1, innerMessage);
         assertTrue(mMessageHandler.handleMessageFromClient(message.toString()));
-        JSONObject volumeMessage = innerMessage.getJSONObject("volume");
         verify(mSession, never()).setMute(anyBoolean());
         verify(mSession, never()).setVolume(anyDouble());
         verify(mMessageHandler)

ui/android/junit/src/org/chromium/ui/base/SelectFileDialogTest.java

@@ -830,7 +830,7 @@ public class SelectFileDialogTest {
 
     /** Returns the determined scope for the accepted |fileTypes|. */
     private int scopeForFileTypes(String... fileTypes) {
-        SelectFileDialog instance = SelectFileDialog.create((long) /* nativeSelectFileDialog= */ 0);
+        SelectFileDialog instance = SelectFileDialog.create(/* nativeSelectFileDialog= */ 0L);
         instance.setFileTypesForTests(new ArrayList<String>(Arrays.asList(fileTypes)));
 
         return instance.determineSelectFileDialogScope();