Don't expose c.g.common types in Error Prone APIs

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=249189259

check_api/src/main/java/com/google/errorprone/VisitorState.java

@@ -18,7 +18,6 @@
 
 import com.google.common.base.Optional;
 import com.google.common.base.Splitter;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableMultiset;
 import com.google.errorprone.BugPattern.SeverityLevel;
@@ -518,7 +517,7 @@ public String getSourceForNode(Tree tree) {
    * <p>This is moderately expensive (the source of the node has to be re-lexed), so it should only
    * be used if a fix is already going to be emitted.
    */
-  public ImmutableList<ErrorProneToken> getTokensForNode(Tree tree) {
+  public List<ErrorProneToken> getTokensForNode(Tree tree) {
     return ErrorProneTokens.getTokens(getSourceForNode(tree), context);
   }
 
@@ -529,7 +528,7 @@ public ImmutableList<ErrorProneToken> getTokensForNode(Tree tree) {
    * <p>This is moderately expensive (the source of the node has to be re-lexed), so it should only
    * be used if a fix is already going to be emitted.
    */
-  public ImmutableList<ErrorProneToken> getOffsetTokensForNode(Tree tree) {
+  public List<ErrorProneToken> getOffsetTokensForNode(Tree tree) {
     int start = ((JCTree) tree).getStartPosition();
     return ErrorProneTokens.getTokens(getSourceForNode(tree), start, context);
   }
@@ -541,7 +540,7 @@ public ImmutableList<ErrorProneToken> getOffsetTokensForNode(Tree tree) {
    * <p>This is moderately expensive (the source of the node has to be re-lexed), so it should only
    * be used if a fix is already going to be emitted.
    */
-  public ImmutableList<ErrorProneToken> getOffsetTokens(int start, int end) {
+  public List<ErrorProneToken> getOffsetTokens(int start, int end) {
     return ErrorProneTokens.getTokens(
         getSourceCode().subSequence(start, end).toString(), start, context);
   }

check_api/src/main/java/com/google/errorprone/fixes/SuggestedFixes.java

@@ -1042,7 +1042,7 @@ public static SuggestedFix replaceIncludingComments(
     } else {
       startTokenization = state.getEndPosition(classTree.getModifiers());
     }
-    ImmutableList<ErrorProneToken> tokens =
+    List<ErrorProneToken> tokens =
         state.getOffsetTokens(startTokenization, state.getEndPosition(tree));
     if (previousMember == null) {
       tokens = getTokensAfterOpeningBrace(tokens);
@@ -1075,8 +1075,7 @@ public static SuggestedFix replaceIncludingComments(
     return SuggestedFix.replace(startPos, state.getEndPosition(tree), replacement);
   }
 
-  private static ImmutableList<ErrorProneToken> getTokensAfterOpeningBrace(
-      ImmutableList<ErrorProneToken> tokens) {
+  private static List<ErrorProneToken> getTokensAfterOpeningBrace(List<ErrorProneToken> tokens) {
     for (int i = 0; i < tokens.size() - 1; ++i) {
       if (tokens.get(i).kind() == TokenKind.LBRACE) {
         return tokens.subList(i + 1, tokens.size());

core/src/main/java/com/google/errorprone/bugpatterns/AnnotationPosition.java

@@ -148,7 +148,7 @@ private Description handle(Tree tree, Name name, ModifiersTree modifiers, Visito
   }
 
   /** Tokenizes as little of the {@code tree} as possible to ensure we grab all the annotations. */
-  private static ImmutableList<ErrorProneToken> annotationTokens(
+  private static List<ErrorProneToken> annotationTokens(
       Tree tree, VisitorState state, int annotationEnd) {
     int endPos;
     if (tree instanceof JCMethodDecl) {

core/src/main/java/com/google/errorprone/bugpatterns/AssignmentToMock.java

@@ -28,6 +28,7 @@
 import static com.google.errorprone.matchers.method.MethodMatchers.staticMethod;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.VisitorState;
 import com.google.errorprone.bugpatterns.BugChecker.AssignmentTreeMatcher;
@@ -49,6 +50,7 @@
 import com.sun.source.util.TreeScanner;
 import com.sun.tools.javac.parser.Tokens.TokenKind;
 import com.sun.tools.javac.tree.JCTree;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /** Discourage manual initialization or assignment to fields annotated with {@code @Mock}. */
@@ -104,9 +106,9 @@ private static SuggestedFix createFix(VariableTree tree, VisitorState state) {
       return SuggestedFix.delete(anno);
     }
     int startPos = ((JCTree) tree).getStartPosition();
-    ImmutableList<ErrorProneToken> tokens =
+    List<ErrorProneToken> tokens =
         state.getOffsetTokens(startPos, ((JCTree) tree.getInitializer()).getStartPosition());
-    for (ErrorProneToken token : tokens.reverse()) {
+    for (ErrorProneToken token : Lists.reverse(tokens)) {
       if (token.kind() == TokenKind.EQ) {
         return SuggestedFix.replace(token.pos(), state.getEndPosition(tree.getInitializer()), "");
       }

core/src/main/java/com/google/errorprone/bugpatterns/InterfaceWithOnlyStatics.java

@@ -20,7 +20,6 @@
 import static com.google.errorprone.bugpatterns.inject.dagger.DaggerAnnotations.isAnyModule;
 import static com.google.errorprone.util.ASTHelpers.getSymbol;
 
-import com.google.common.collect.ImmutableList;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.BugPattern.ProvidesFix;
 import com.google.errorprone.BugPattern.SeverityLevel;
@@ -106,7 +105,7 @@ public Description matchClass(ClassTree tree, VisitorState state) {
   private static SuggestedFix fixClass(ClassTree classTree, VisitorState state) {
     int startPos = ((JCTree) classTree).getStartPosition();
     int endPos = ((JCTree) classTree.getMembers().get(0)).getStartPosition();
-    ImmutableList<ErrorProneToken> tokens = state.getOffsetTokens(startPos, endPos);
+    List<ErrorProneToken> tokens = state.getOffsetTokens(startPos, endPos);
     String modifiers =
         getSymbol(classTree).owner.enclClass() == null ? "final class" : "static final class";
     SuggestedFix.Builder fix = SuggestedFix.builder();

core/src/main/java/com/google/errorprone/bugpatterns/MixedArrayDimensions.java

@@ -21,7 +21,6 @@
 import static com.google.errorprone.matchers.Description.NO_MATCH;
 
 import com.google.common.base.CharMatcher;
-import com.google.common.collect.ImmutableList;
 import com.google.errorprone.BugPattern;
 import com.google.errorprone.BugPattern.StandardTags;
 import com.google.errorprone.VisitorState;
@@ -35,6 +34,7 @@
 import com.sun.source.tree.Tree;
 import com.sun.source.tree.VariableTree;
 import com.sun.tools.javac.parser.Tokens.TokenKind;
+import java.util.List;
 
 /** @author cushon@google.com (Liam Miller-Cushon) */
 @BugPattern(
@@ -70,7 +70,7 @@ private Description checkArrayDimensions(Tree tree, Tree type, VisitorState stat
       if (start >= end) {
         continue;
       }
-      ImmutableList<ErrorProneToken> tokens = state.getOffsetTokens(start, end);
+      List<ErrorProneToken> tokens = state.getOffsetTokens(start, end);
       if (tokens.size() > 2 && tokens.get(0).kind() == TokenKind.IDENTIFIER) {
         String dim = source.subSequence(start, end).toString();
         int nonWhitespace = CharMatcher.isNot(' ').indexIn(dim);