Enable CollectionUndefinedEquality errorprone check

Bug: 1029038
Change-Id: I84568516fea23cf21bc91afb79bb90096d8a5963
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2595721
Commit-Queue: Sam Maier <smaier@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839171}

build/android/gyp/compile_java.py

@@ -31,8 +31,6 @@ _JAVAC_EXTRACTOR = os.path.join(build_utils.DIR_SOURCE_ROOT, 'third_party',
 
 # Full list of checks: https://errorprone.info/bugpatterns
 ERRORPRONE_WARNINGS_TO_DISABLE = [
-    # These should really be turned on.
-    'CollectionUndefinedEquality',
     # The following are super useful, but existing issues need to be fixed first
     # before they can start failing the build on new errors.
     'InvalidParam',

chrome/android/features/vr/java/src/org/chromium/chrome/browser/vr/VrDelegate.java

@@ -254,7 +254,7 @@ public abstract class VrDelegate implements VrHandler {
 
         // Only Samsung devices change resolution in VR.
         if (!model.startsWith(SAMSUNG_GALAXY_PREFIX)) return false;
-        CharSequence modelNumber = model.subSequence(3, 7);
+        String modelNumber = model.substring(3, 7);
         // Only S8(+) and Note 8 models change resolution in VR.
         if (!SAMSUNG_GALAXY_8_MODELS.contains(modelNumber)) return false;
         return true;

chrome/android/java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorFieldModel.java

@@ -124,7 +124,7 @@ public class EditorFieldModel {
     @Nullable
     private HashMap<String, CharSequence> mDropdownKeyToValueMap;
     @Nullable
-    private HashMap<CharSequence, String> mDropdownValueToKeyMap;
+    private HashMap<String, String> mDropdownValueToKeyMap;
     @Nullable
     private Set<String> mDropdownKeys;
     @Nullable
@@ -436,7 +436,10 @@ public class EditorFieldModel {
     @Nullable
     public String getDropdownKeyByValue(@Nullable CharSequence value) {
         assert mInputTypeHint == INPUT_TYPE_HINT_DROPDOWN;
-        return mDropdownValueToKeyMap.get(value);
+        if (value == null) {
+            return null;
+        }
+        return mDropdownValueToKeyMap.get(value.toString());
     }
 
     /**
@@ -462,8 +465,8 @@ public class EditorFieldModel {
         mDropdownValueToKeyMap = new HashMap<>();
         for (int i = 0; i < mDropdownKeyValues.size(); i++) {
             mDropdownKeys.add(mDropdownKeyValues.get(i).getKey());
-            mDropdownValueToKeyMap.put(
-                    mDropdownKeyValues.get(i).getValue(), mDropdownKeyValues.get(i).getKey());
+            mDropdownValueToKeyMap.put(mDropdownKeyValues.get(i).getValue().toString(),
+                    mDropdownKeyValues.get(i).getKey());
             mDropdownKeyToValueMap.put(
                     mDropdownKeyValues.get(i).getKey(), mDropdownKeyValues.get(i).getValue());
         }