Update from https://crrev.com/328418

base/BUILD.gn

 # Copyright (c) 2013 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/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
@@ skipping 90 matching lines @@
     "android/jni_registrar.h",
     "android/jni_string.cc",
     "android/jni_string.h",
     "android/jni_utils.cc",
     "android/jni_utils.h",
     "android/jni_weak_ref.cc",
     "android/jni_weak_ref.h",
     "android/library_loader/library_load_from_apk_status_codes.h",
     "android/library_loader/library_loader_hooks.cc",
     "android/library_loader/library_loader_hooks.h",
+    "android/library_loader/library_prefetcher.cc",
+    "android/library_loader/library_prefetcher.h",
     "android/locale_utils.cc",
     "android/locale_utils.h",
     "android/memory_pressure_listener_android.cc",
     "android/memory_pressure_listener_android.h",
     "android/path_service_android.cc",
     "android/path_service_android.h",
     "android/path_utils.cc",
     "android/path_utils.h",
     "android/record_histogram.cc",
     "android/record_histogram.h",
@@ skipping 46 matching lines @@
     "cancelable_callback.h",
     "chromeos/memory_pressure_monitor_chromeos.cc",
     "chromeos/memory_pressure_monitor_chromeos.h",
     "command_line.cc",
     "command_line.h",
     "compiler_specific.h",
     "containers/adapters.h",
     "containers/hash_tables.h",
     "containers/linked_list.h",
     "containers/mru_cache.h",
+    "containers/scoped_ptr_hash_map.h",
     "containers/small_map.h",
     "containers/stack_container.h",
     "cpu.cc",
     "cpu.h",
     "critical_closure.h",
     "critical_closure_internal_ios.mm",
     "deferred_sequenced_task_runner.cc",
     "deferred_sequenced_task_runner.h",
     "environment.cc",
     "environment.h",
@@ skipping 86 matching lines @@
     "mac/launchd.cc",
     "mac/launchd.h",
     "mac/libdispatch_task_runner.cc",
     "mac/libdispatch_task_runner.h",
     "mac/mac_logging.cc",
     "mac/mac_logging.h",
     "mac/mac_util.h",
     "mac/mac_util.mm",
     "mac/mach_logging.cc",
     "mac/mach_logging.h",
+    "mac/memory_pressure_monitor_mac.cc",
+    "mac/memory_pressure_monitor_mac.h",
     "mac/objc_property_releaser.h",
     "mac/objc_property_releaser.mm",
     "mac/os_crash_dumps.cc",
     "mac/os_crash_dumps.h",
     "mac/scoped_aedesc.h",
     "mac/scoped_authorizationref.h",
     "mac/scoped_block.h",
     "mac/scoped_cftyperef.h",
     "mac/scoped_ioobject.h",
     "mac/scoped_ioplugininterface.h",
@@ skipping 767 matching lines @@
   }
 }
 
 test("base_unittests") {
   sources = [
     "android/application_status_listener_unittest.cc",
     "android/content_uri_utils_unittest.cc",
     "android/jni_android_unittest.cc",
     "android/jni_array_unittest.cc",
     "android/jni_string_unittest.cc",
+    "android/library_loader/library_prefetcher_unittest.cc",
     "android/path_utils_unittest.cc",
     "android/scoped_java_ref_unittest.cc",
     "android/sys_utils_unittest.cc",
     "async_socket_io_handler_unittest.cc",
     "at_exit_unittest.cc",
     "atomicops_unittest.cc",
     "barrier_closure_unittest.cc",
     "base64_unittest.cc",
     "big_endian_unittest.cc",
     "bind_unittest.cc",
     "bind_unittest.nc",
     "bits_unittest.cc",
     "build_time_unittest.cc",
     "callback_helpers_unittest.cc",
     "callback_list_unittest.cc",
     "callback_list_unittest.nc",
     "callback_unittest.cc",
     "callback_unittest.nc",
     "cancelable_callback_unittest.cc",
     "chromeos/memory_pressure_monitor_chromeos_unittest.cc",
     "command_line_unittest.cc",
     "containers/adapters_unittest.cc",
     "containers/hash_tables_unittest.cc",
     "containers/linked_list_unittest.cc",
     "containers/mru_cache_unittest.cc",
+    "containers/scoped_ptr_hash_map_unittest.cc",
     "containers/small_map_unittest.cc",
     "containers/stack_container_unittest.cc",
     "cpu_unittest.cc",
     "debug/crash_logging_unittest.cc",
     "debug/debugger_unittest.cc",
     "debug/leak_tracker_unittest.cc",
     "debug/proc_maps_linux_unittest.cc",
     "debug/stack_trace_unittest.cc",
     "debug/task_annotator_unittest.cc",
     "deferred_sequenced_task_runner_unittest.cc",
@@ skipping 336 matching lines @@
       ":base_java",
       ":base_java_test_support",
     ]
     DEPRECATED_java_in_dir = "android/javatests/src"
   }
 
   # GYP: //base.gyp:base_java_test_support
   android_library("base_java_test_support") {
     deps = [
       ":base_java",
+      "//testing/android/reporter:reporter_java",
     ]
     DEPRECATED_java_in_dir = "test/android/javatests/src"
   }
 
   # GYP: //base.gyp:base_junit_tests
   junit_binary("base_junit_tests") {
     java_files = [ "android/junit/src/org/chromium/base/LogTest.java" ]
     deps = [
       ":base_java",
       ":base_java_test_support",
@@ skipping 29 matching lines @@
 
   # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files =
         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 }