Rollback SourceFile changes.

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

src/com/google/javascript/jscomp/SourceFile.java

@@ -22,6 +22,7 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.io.CharStreams;
+import com.google.common.io.Files;
 import com.google.common.io.Resources;
 import com.google.javascript.rhino.StaticSourceFile;
 import java.io.File;
@@ -36,8 +37,6 @@
 import java.net.URLConnection;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Enumeration;
@@ -395,23 +394,14 @@ public static SourceFile fromFile(String fileName, Charset charset) {
 
   @GwtIncompatible("java.io.File")
   public static SourceFile fromFile(String fileName) {
-    return fromFile(fileName, UTF_8);
+    return builder().buildFromFile(fileName);
   }
 
-  @GwtIncompatible("java.io.File")
-  public static SourceFile fromPath(Path path, Charset c) {
-    return builder().withCharset(c).buildFromPath(path);
-  }
-
-  /** @deprecated Use {@link SourceFile#fromPath(Path, Charset)} */
-  @Deprecated
   @GwtIncompatible("java.io.File")
   public static SourceFile fromFile(File file, Charset c) {
     return builder().withCharset(c).buildFromFile(file);
   }
 
-  /** @deprecated Use {@link #fromPath(Path, Charset)} */
-  @Deprecated
   @GwtIncompatible("java.io.File")
   public static SourceFile fromFile(File file) {
     return builder().buildFromFile(file);
@@ -483,12 +473,7 @@ public SourceFile buildFromFile(String fileName) {
 
     @GwtIncompatible("java.io.File")
     public SourceFile buildFromFile(File file) {
-      return new OnDisk(file.toPath(), originalPath, charset);
-    }
-
-    @GwtIncompatible("java.io.File")
-    public SourceFile buildFromPath(Path path) {
-      return new OnDisk(path, originalPath, charset);
+      return new OnDisk(file, originalPath, charset);
     }
 
     @GwtIncompatible("java.net.URL")
@@ -577,17 +562,17 @@ public void clearCachedSource() {
   @GwtIncompatible("java.io.File")
   static class OnDisk extends SourceFile {
     private static final long serialVersionUID = 1L;
-    private final Path path;
+    private final File file;
 
     // This is stored as a String, but passed in and out as a Charset so that
     // we can serialize the class.
     // Default input file format for the compiler has always been UTF_8.
-    private Charset inputCharset = UTF_8;
+    private String inputCharset = UTF_8.name();
 
-    OnDisk(Path path, String originalPath, Charset c) {
-      super(path.toString());
-      this.path = path;
-      setOriginalPath(originalPath);
+    OnDisk(File file, String originalPath, Charset c) {
+      super(file.getPath());
+      this.file = file;
+      super.setOriginalPath(originalPath);
       if (c != null) {
         this.setCharset(c);
       }
@@ -598,8 +583,8 @@ public synchronized String getCode() throws IOException {
       String cachedCode = super.getCode();
 
       if (cachedCode == null) {
-        cachedCode = CharStreams.toString(getCodeReader());
-        super.setCode(cachedCode, Objects.equals(this.getCharset(), inputCharset));
+        cachedCode = Files.toString(file, this.getCharset());
+        super.setCode(cachedCode, Objects.equals(this.getCharset(), StandardCharsets.UTF_8));
         // Byte Order Mark can be removed by setCode
         cachedCode = super.getCode();
       }
@@ -610,12 +595,13 @@ public synchronized String getCode() throws IOException {
      * Gets a reader for the code in this source file.
      */
     @Override
+    @GwtIncompatible("java.io.Reader")
     public Reader getCodeReader() throws IOException {
       if (hasSourceInMemory()) {
         return super.getCodeReader();
       } else {
         // If we haven't pulled the code into memory yet, don't.
-        return Files.newBufferedReader(path, inputCharset);
+        return Files.newReader(file, StandardCharsets.UTF_8);
       }
     }
 
@@ -633,7 +619,7 @@ public void clearCachedSource() {
      * @param c charset to use when reading the input.
      */
     public void setCharset(Charset c) {
-      inputCharset = c;
+      inputCharset = c.name();
     }
 
     /**
@@ -643,7 +629,7 @@ public void setCharset(Charset c) {
      * @return Charset object representing charset to use.
      */
     public Charset getCharset() {
-      return inputCharset;
+      return Charset.forName(inputCharset);
     }
   }