Changes to update Junit and Mockito.

third_party/junit/BUILD.gn

Index: third_party/junit/BUILD.gn
diff --git a/third_party/junit/BUILD.gn b/third_party/junit/BUILD.gn
index c397721e75367645e0d7ee8113d66c72be664fe5..569f9e2533008b8032a6e508ccf6a49b218e22c7 100644
--- a/third_party/junit/BUILD.gn
+++ b/third_party/junit/BUILD.gn
@@ -4,17 +4,11 @@
 
 import("//build/config/android/rules.gni")
 
-# GYP: //third_party/junit.gyp:hamcrest_jar
-java_prebuilt("hamcrest") {
-  jar_path = "src/lib/hamcrest-core-1.1.jar"
-}
-
-# GYP: //third_party/junit.gyp:junit_jar
 java_library("junit") {
   chromium_code = false
   testonly = true
   deps = [
-    ":hamcrest",
+    "//third_party/hamcrest:hamcrest_java",
   ]
   java_files = [
     "src/src/main/java/junit/extensions/ActiveTestSuite.java",
@@ -48,16 +42,22 @@ java_library("junit") {
     "src/src/main/java/org/junit/AfterClass.java",
     "src/src/main/java/org/junit/Assert.java",
     "src/src/main/java/org/junit/Assume.java",
+    "src/src/main/java/org/junit/AssumptionViolatedException.java",
     "src/src/main/java/org/junit/Before.java",
     "src/src/main/java/org/junit/BeforeClass.java",
     "src/src/main/java/org/junit/ClassRule.java",
     "src/src/main/java/org/junit/ComparisonFailure.java",
+    "src/src/main/java/org/junit/FixMethodOrder.java",
     "src/src/main/java/org/junit/Ignore.java",
     "src/src/main/java/org/junit/Rule.java",
     "src/src/main/java/org/junit/Test.java",
     "src/src/main/java/org/junit/experimental/ParallelComputer.java",
     "src/src/main/java/org/junit/experimental/categories/Categories.java",
     "src/src/main/java/org/junit/experimental/categories/Category.java",
+    "src/src/main/java/org/junit/experimental/categories/CategoryFilterFactory.java",
+    "src/src/main/java/org/junit/experimental/categories/CategoryValidator.java",
+    "src/src/main/java/org/junit/experimental/categories/ExcludeCategories.java",
+    "src/src/main/java/org/junit/experimental/categories/IncludeCategories.java",
     "src/src/main/java/org/junit/experimental/max/CouldNotReadCoreException.java",
     "src/src/main/java/org/junit/experimental/max/MaxCore.java",
     "src/src/main/java/org/junit/experimental/max/MaxHistory.java",
@@ -67,6 +67,7 @@ java_library("junit") {
     "src/src/main/java/org/junit/experimental/runners/Enclosed.java",
     "src/src/main/java/org/junit/experimental/theories/DataPoint.java",
     "src/src/main/java/org/junit/experimental/theories/DataPoints.java",
+    "src/src/main/java/org/junit/experimental/theories/FromDataPoints.java",
     "src/src/main/java/org/junit/experimental/theories/ParameterSignature.java",
     "src/src/main/java/org/junit/experimental/theories/ParameterSupplier.java",
     "src/src/main/java/org/junit/experimental/theories/ParametersSuppliedBy.java",
@@ -75,17 +76,23 @@ java_library("junit") {
     "src/src/main/java/org/junit/experimental/theories/Theory.java",
     "src/src/main/java/org/junit/experimental/theories/internal/AllMembersSupplier.java",
     "src/src/main/java/org/junit/experimental/theories/internal/Assignments.java",
+    "src/src/main/java/org/junit/experimental/theories/internal/BooleanSupplier.java",
+    "src/src/main/java/org/junit/experimental/theories/internal/EnumSupplier.java",
     "src/src/main/java/org/junit/experimental/theories/internal/ParameterizedAssertionError.java",
+    "src/src/main/java/org/junit/experimental/theories/internal/SpecificDataPointsSupplier.java",
     "src/src/main/java/org/junit/experimental/theories/suppliers/TestedOn.java",
     "src/src/main/java/org/junit/experimental/theories/suppliers/TestedOnSupplier.java",
     "src/src/main/java/org/junit/internal/ArrayComparisonFailure.java",
     "src/src/main/java/org/junit/internal/AssumptionViolatedException.java",
+    "src/src/main/java/org/junit/internal/Classes.java",
     "src/src/main/java/org/junit/internal/ComparisonCriteria.java",
     "src/src/main/java/org/junit/internal/ExactComparisonCriteria.java",
     "src/src/main/java/org/junit/internal/InexactComparisonCriteria.java",
     "src/src/main/java/org/junit/internal/JUnitSystem.java",
+    "src/src/main/java/org/junit/internal/MethodSorter.java",
     "src/src/main/java/org/junit/internal/RealSystem.java",
     "src/src/main/java/org/junit/internal/TextListener.java",
+    "src/src/main/java/org/junit/internal/Throwables.java",
     "src/src/main/java/org/junit/internal/builders/AllDefaultPossibilitiesBuilder.java",
     "src/src/main/java/org/junit/internal/builders/AnnotatedBuilder.java",
     "src/src/main/java/org/junit/internal/builders/IgnoredBuilder.java",
@@ -93,12 +100,10 @@ java_library("junit") {
     "src/src/main/java/org/junit/internal/builders/JUnit3Builder.java",
     "src/src/main/java/org/junit/internal/builders/JUnit4Builder.java",
     "src/src/main/java/org/junit/internal/builders/NullBuilder.java",
+    "src/src/main/java/org/junit/internal/matchers/StacktracePrintingMatcher.java",
     "src/src/main/java/org/junit/internal/builders/SuiteMethodBuilder.java",
-    "src/src/main/java/org/junit/internal/matchers/CombinableMatcher.java",
-    "src/src/main/java/org/junit/internal/matchers/Each.java",
-    "src/src/main/java/org/junit/internal/matchers/IsCollectionContaining.java",
-    "src/src/main/java/org/junit/internal/matchers/StringContains.java",
-    "src/src/main/java/org/junit/internal/matchers/SubstringMatcher.java",
+    "src/src/main/java/org/junit/internal/matchers/ThrowableCauseMatcher.java",
+    "src/src/main/java/org/junit/internal/matchers/ThrowableMessageMatcher.java",
     "src/src/main/java/org/junit/internal/matchers/TypeSafeMatcher.java",
     "src/src/main/java/org/junit/internal/requests/ClassRequest.java",
     "src/src/main/java/org/junit/internal/requests/FilterRequest.java",
@@ -119,7 +124,8 @@ java_library("junit") {
     "src/src/main/java/org/junit/internal/runners/model/MultipleFailureException.java",
     "src/src/main/java/org/junit/internal/runners/model/ReflectiveCallable.java",
     "src/src/main/java/org/junit/internal/runners/package-info.java",
-    "src/src/main/java/org/junit/internal/runners/rules/RuleFieldValidator.java",
+    "src/src/main/java/org/junit/internal/runners/rules/RuleMemberValidator.java",
+    "src/src/main/java/org/junit/internal/runners/rules/ValidationError.java",
     "src/src/main/java/org/junit/internal/runners/statements/ExpectException.java",
     "src/src/main/java/org/junit/internal/runners/statements/Fail.java",
     "src/src/main/java/org/junit/internal/runners/statements/FailOnTimeout.java",
@@ -129,12 +135,15 @@ java_library("junit") {
     "src/src/main/java/org/junit/matchers/JUnitMatchers.java",
     "src/src/main/java/org/junit/matchers/package-info.java",
     "src/src/main/java/org/junit/package-info.java",
+    "src/src/main/java/org/junit/rules/DisableOnDebug.java",
     "src/src/main/java/org/junit/rules/ErrorCollector.java",
     "src/src/main/java/org/junit/rules/ExpectedException.java",
+    "src/src/main/java/org/junit/rules/ExpectedExceptionMatcherBuilder.java",
     "src/src/main/java/org/junit/rules/ExternalResource.java",
     "src/src/main/java/org/junit/rules/MethodRule.java",
     "src/src/main/java/org/junit/rules/RuleChain.java",
     "src/src/main/java/org/junit/rules/RunRules.java",
+    "src/src/main/java/org/junit/rules/Stopwatch.java",
     "src/src/main/java/org/junit/rules/TemporaryFolder.java",
     "src/src/main/java/org/junit/rules/TestName.java",
     "src/src/main/java/org/junit/rules/TestRule.java",
@@ -145,6 +154,10 @@ java_library("junit") {
     "src/src/main/java/org/junit/runner/Computer.java",
     "src/src/main/java/org/junit/runner/Describable.java",
     "src/src/main/java/org/junit/runner/Description.java",
+    "src/src/main/java/org/junit/runner/FilterFactories.java",
+    "src/src/main/java/org/junit/runner/FilterFactory.java",
+    "src/src/main/java/org/junit/runner/FilterFactoryParams.java",
+    "src/src/main/java/org/junit/runner/JUnitCommandLineParseResult.java",
     "src/src/main/java/org/junit/runner/JUnitCore.java",
     "src/src/main/java/org/junit/runner/Request.java",
     "src/src/main/java/org/junit/runner/Result.java",
@@ -160,14 +173,17 @@ java_library("junit") {
     "src/src/main/java/org/junit/runner/notification/RunListener.java",
     "src/src/main/java/org/junit/runner/notification/RunNotifier.java",
     "src/src/main/java/org/junit/runner/notification/StoppedByUserException.java",
+    "src/src/main/java/org/junit/runner/notification/SynchronizedRunListener.java",
     "src/src/main/java/org/junit/runner/notification/package-info.java",
     "src/src/main/java/org/junit/runner/package-info.java",
     "src/src/main/java/org/junit/runners/AllTests.java",
     "src/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java",
     "src/src/main/java/org/junit/runners/JUnit4.java",
+    "src/src/main/java/org/junit/runners/MethodSorters.java",
     "src/src/main/java/org/junit/runners/Parameterized.java",
     "src/src/main/java/org/junit/runners/ParentRunner.java",
     "src/src/main/java/org/junit/runners/Suite.java",
+    "src/src/main/java/org/junit/runners/model/Annotatable.java",
     "src/src/main/java/org/junit/runners/model/FrameworkField.java",
     "src/src/main/java/org/junit/runners/model/FrameworkMember.java",
     "src/src/main/java/org/junit/runners/model/FrameworkMethod.java",
@@ -178,6 +194,17 @@ java_library("junit") {
     "src/src/main/java/org/junit/runners/model/RunnerScheduler.java",
     "src/src/main/java/org/junit/runners/model/Statement.java",
     "src/src/main/java/org/junit/runners/model/TestClass.java",
+    "src/src/main/java/org/junit/runners/model/TestTimedOutException.java",
     "src/src/main/java/org/junit/runners/package-info.java",
+    "src/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParameters.java",
+    "src/src/main/java/org/junit/runners/parameterized/BlockJUnit4ClassRunnerWithParametersFactory.java",
+    "src/src/main/java/org/junit/runners/parameterized/ParametersRunnerFactory.java",
+    "src/src/main/java/org/junit/runners/parameterized/TestWithParameters.java",
+    "src/src/main/java/org/junit/validator/AnnotationValidator.java",
+    "src/src/main/java/org/junit/validator/AnnotationValidatorFactory.java",
+    "src/src/main/java/org/junit/validator/AnnotationsValidator.java",
+    "src/src/main/java/org/junit/validator/PublicClassValidator.java",
+    "src/src/main/java/org/junit/validator/TestClassValidator.java",
+    "src/src/main/java/org/junit/validator/ValidateWith.java",
   ]
 }