Index: testing/android/junit/java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java |
diff --git a/testing/android/junit/java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java b/testing/android/junit/java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java |
index 293525ee7170cfedf8ff9e72202a542e01c7a6d4..cf6202b0507d863108ed40b2e814e144b7561c21 100644 |
--- a/testing/android/junit/java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java |
+++ b/testing/android/junit/java/src/org/chromium/testing/local/LocalRobolectricTestRunner.java |
@@ -8,13 +8,10 @@ import org.junit.runners.model.InitializationError; |
import org.robolectric.AndroidManifest; |
import org.robolectric.DependencyResolver; |
-import org.robolectric.LocalDependencyResolver; |
import org.robolectric.RobolectricTestRunner; |
import org.robolectric.SdkConfig; |
import org.robolectric.annotation.Config; |
-import java.io.File; |
- |
/** |
* A custom Robolectric Junit4 Test Runner. This test runner will load the |
* "real" android jars from a local directory rather than use Maven to fetch |
@@ -32,13 +29,7 @@ public class LocalRobolectricTestRunner extends RobolectricTestRunner { |
@Override |
protected final DependencyResolver getJarResolver() { |
- String dependencyDir = System.getProperty("robolectric.dependency.dir"); |
- if (dependencyDir == null) { |
- throw new IllegalStateException("robolectric.dependency.dir not specified. Make sure" |
- + " you are setting the robolectric.dependency.dir system property to the" |
- + " directory containing Robolectric's runtime dependency jars."); |
- } |
- return new LocalDependencyResolver(new File(dependencyDir)); |
+ return new RobolectricClasspathDependencyResolver(); |
} |
@Override |