MOE automated commit.

Deprecates DiskLruCachWrapper.get().

instrumentation/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
   package="com.bumptech.glide.instrumentation.test">
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-  <application>
+  <application android:label="GlideTest">
+    <uses-library android:name="android.test.runner" />
   </application>
+
+  <instrumentation android:targetPackage="com.bumptech.glide.instrumentation"
+                   android:name="com.google.android.apps.common.testing.testrunner.Google3InstrumentationTestRunner"
+                   android:label="Glide Emulator Tests" />
 </manifest>

instrumentation/src/androidTest/java/com/bumptech/glide/test/TearDownGlide.java

@@ -17,7 +17,6 @@ public Statement apply(final Statement base, Description description) {
     return new Statement() {
       @Override
       public void evaluate() throws Throwable {
-        tearDownGlide();
         base.evaluate();
         tearDownGlide();
       }

library/src/main/java/com/bumptech/glide/load/engine/cache/DiskLruCacheFactory.java

@@ -63,6 +63,6 @@ public DiskCache build() {
       return null;
     }
 
-    return DiskLruCacheWrapper.get(cacheDir, diskCacheSize);
+    return DiskLruCacheWrapper.create(cacheDir, diskCacheSize);
   }
 }

library/src/main/java/com/bumptech/glide/load/engine/cache/DiskLruCacheWrapper.java

@@ -38,7 +38,10 @@ public class DiskLruCacheWrapper implements DiskCache {
    * @param directory The directory for the disk cache
    * @param maxSize   The max size for the disk cache
    * @return The new disk cache with the given arguments, or the current cache if one already exists
+   *
+   * @deprecated Use {@link #create(File, long)} to create a new cache with the specified arguments.
    */
+  @Deprecated
   public static synchronized DiskCache get(File directory, long maxSize) {
     // TODO calling twice with different arguments makes it return the cache for the same
     // directory, it's public!
@@ -48,6 +51,17 @@ public static synchronized DiskCache get(File directory, long maxSize) {
     return wrapper;
   }
 
+  /**
+   * Create a new DiskCache in the given directory with a specified max size.
+   *
+   * @param directory The directory for the disk cache
+   * @param maxSize   The max size for the disk cache
+   * @return The new disk cache with the given arguments
+   */
+  public static DiskCache create(File directory, long maxSize) {
+    return new DiskLruCacheWrapper(directory, maxSize);
+  }
+
   protected DiskLruCacheWrapper(File directory, long maxSize) {
     this.directory = directory;
     this.maxSize = maxSize;

library/src/main/java/com/bumptech/glide/util/LruCache.java

@@ -1,7 +1,6 @@
 package com.bumptech.glide.util;
 
 import android.support.annotation.Nullable;
-
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;