Changes to update Junit and Mockito.

chrome/android/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build_overrides/v8.gni")
 import("//chrome/android/chrome_public_apk_tmpl.gni")
 import("//chrome/common/features.gni")
 import("//chrome/version.gni")
@@ skipping 303 matching lines @@
     "//components/sync:sync_java_test_support",
     "//components/sync/android:sync_java",
     "//components/web_restrictions:web_restrictions_java",
     "//content/public/android:content_java",
     "//device/geolocation:geolocation_java",
     "//net/android:net_java",
     "//third_party/WebKit/public:blink_headers_java",
     "//third_party/android_tools:android_support_v7_mediarouter_java",
     "//third_party/android_tools:android_support_v7_recyclerview_java",
     "//third_party/cacheinvalidation:cacheinvalidation_javalib",
-    "//third_party/junit:hamcrest",
+    "//third_party/hamcrest:hamcrest_java",
     "//ui/android:ui_java",
     google_play_services_library,
   ]
   srcjar_deps = [ "//base:base_build_config_gen" ]
 }
 
 # GYP: //chrome/chrome_android.gypi:chrome_version_java
 chrome_version_java_dir = "$root_gen_dir/templates/chrome_version_java"
 chrome_version_java_file = "$chrome_version_java_dir/org/chromium/chrome/browser/ChromeVersionConstants.java"
 process_version("chrome_version_java") {
@@ skipping 305 matching lines @@
 instrumentation_test_apk("chrome_sync_shell_test_apk") {
   apk_name = "ChromeSyncShellTest"
   apk_under_test = ":chrome_sync_shell_apk"
   android_manifest = chrome_sync_shell_test_apk_manifest
   android_manifest_dep = ":chrome_sync_shell_test_apk_manifest"
   deps = [
     ":chrome_sync_shell_test_apk_java",
   ]
   proguard_enabled = !is_java_debug
 }