Use Iterables.transform again (except for one method that apparently wants Lists.transform).

This undoes some accidental changes from cl/687466612.

RELNOTES=n/a
PiperOrigin-RevId: 691507206

Author: cpovirk

android/guava-tests/test/com/google/common/collect/IterablesTest.java

@@ -27,10 +27,8 @@
 import static com.google.common.collect.Iterables.mergeSorted;
 import static com.google.common.collect.Iterables.removeIf;
 import static com.google.common.collect.Iterables.skip;
-import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Iterables.tryFind;
 import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Lists.transform;
 import static com.google.common.collect.ReflectionFreeAssertThrows.assertThrows;
 import static com.google.common.collect.Sets.newHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSet;
@@ -287,7 +285,7 @@ public void testFilterByType_iterator() throws Exception {
   public void testTransform_iterator() {
     List<String> input = asList("1", "2", "3");
     Iterable<Integer> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<String, Integer>() {
               @Override
@@ -306,7 +304,7 @@ public Integer apply(String from) {
   public void testPoorlyBehavedTransform() {
     List<String> input = asList("1", "not a number", "3");
     Iterable<Integer> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<String, Integer>() {
               @Override
@@ -324,7 +322,7 @@ public Integer apply(String from) {
   public void testNullFriendlyTransform() {
     List<@Nullable Integer> input = asList(1, 2, null, 3);
     Iterable<String> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<@Nullable Integer, String>() {
               @Override
@@ -1020,7 +1018,7 @@ public boolean apply(String s) {
   public void testRemoveIf_transformedList() {
     List<String> list = newArrayList("1", "2", "3", "4", "5");
     List<Integer> transformed =
-        transform(
+        Lists.transform(
             list,
             new Function<String, Integer>() {
               @Override

guava-tests/test/com/google/common/collect/IterablesTest.java

@@ -27,10 +27,8 @@
 import static com.google.common.collect.Iterables.mergeSorted;
 import static com.google.common.collect.Iterables.removeIf;
 import static com.google.common.collect.Iterables.skip;
-import static com.google.common.collect.Iterables.transform;
 import static com.google.common.collect.Iterables.tryFind;
 import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Lists.transform;
 import static com.google.common.collect.ReflectionFreeAssertThrows.assertThrows;
 import static com.google.common.collect.Sets.newHashSet;
 import static com.google.common.collect.Sets.newLinkedHashSet;
@@ -299,7 +297,7 @@ public void testFilterByType_forEach() throws Exception {
   public void testTransform_iterator() {
     List<String> input = asList("1", "2", "3");
     Iterable<Integer> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<String, Integer>() {
               @Override
@@ -318,7 +316,7 @@ public Integer apply(String from) {
   public void testTransform_forEach() {
     List<Integer> input = asList(1, 2, 3, 4);
     Iterable<String> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<Integer, String>() {
               @Override
@@ -335,7 +333,7 @@ public String apply(Integer from) {
   public void testPoorlyBehavedTransform() {
     List<String> input = asList("1", "not a number", "3");
     Iterable<Integer> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<String, Integer>() {
               @Override
@@ -353,7 +351,7 @@ public Integer apply(String from) {
   public void testNullFriendlyTransform() {
     List<@Nullable Integer> input = asList(1, 2, null, 3);
     Iterable<String> result =
-        transform(
+        Iterables.transform(
             input,
             new Function<@Nullable Integer, String>() {
               @Override
@@ -1057,7 +1055,7 @@ public boolean apply(String s) {
   public void testRemoveIf_transformedList() {
     List<String> list = newArrayList("1", "2", "3", "4", "5");
     List<Integer> transformed =
-        transform(
+        Lists.transform(
             list,
             new Function<String, Integer>() {
               @Override