Update from https://crrev.com/306655

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")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
@@ skipping 128 matching lines @@
     "debug/crash_logging.cc",
     "debug/crash_logging.h",
     "debug/debugger.cc",
     "debug/debugger.h",
     "debug/debugger_posix.cc",
     "debug/debugger_win.cc",
     "debug/dump_without_crashing.cc",
     "debug/dump_without_crashing.h",
     "debug/gdi_debug_util_win.cc",
     "debug/gdi_debug_util_win.h",
+
     # This file depends on files from the "allocator" target,
     # but this target does not depend on "allocator" (see
     # allocator.gyp for details).
     "debug/leak_annotations.h",
     "debug/leak_tracker.h",
     "debug/proc_maps_linux.cc",
     "debug/proc_maps_linux.h",
     "debug/profiler.cc",
     "debug/profiler.h",
     "debug/stack_trace.cc",
@@ skipping 594 matching lines @@
     "process/process_handle_freebsd.cc",
     "process/process_handle_openbsd.cc",
     "process/process_iterator_freebsd.cc",
     "process/process_iterator_openbsd.cc",
     "process/process_metrics_freebsd.cc",
     "process/process_metrics_openbsd.cc",
     "sys_info_freebsd.cc",
     "sys_info_openbsd.cc",
   ]
 
-  defines = [
-    "BASE_IMPLEMENTATION",
-  ]
+  defines = [ "BASE_IMPLEMENTATION" ]
 
   deps = [
     ":base_static",
     "//base/allocator:allocator_extension_thunks",
     "//base/third_party/dynamic_annotations",
     "//base/third_party/nspr",
     "//third_party/modp_b64",
   ]
 
   if (is_android) {
     sources += [
-       "memory/discardable_memory_ashmem_allocator.cc",
-       "memory/discardable_memory_ashmem_allocator.h",
-       "memory/discardable_memory_ashmem.cc",
-       "memory/discardable_memory_ashmem.h",
+      "memory/discardable_memory_ashmem_allocator.cc",
+      "memory/discardable_memory_ashmem_allocator.h",
+      "memory/discardable_memory_ashmem.cc",
+      "memory/discardable_memory_ashmem.h",
     ]
     sources -= [
       "base_paths_posix.cc",
       "power_monitor/power_monitor_device_source_posix.cc",
     ]
 
     # Android uses some Linux sources, put those back.
     set_sources_assignment_filter([])
     sources += [
       "debug/proc_maps_linux.cc",
       "files/file_path_watcher_linux.cc",
       "process/memory_linux.cc",
       "process/internal_linux.cc",
       "process/process_handle_linux.cc",
       "process/process_iterator_linux.cc",
       "process/process_metrics_linux.cc",
       "posix/unix_domain_socket_linux.cc",
       "sys_info_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     deps += [
       ":base_jni_headers",
       "//third_party/ashmem",
-      "//third_party/android_tools:cpu_features"
+      "//third_party/android_tools:cpu_features",
     ]
 
     # logging.cc uses the Android logging library.
     libs = [ "log" ]
 
-    sources -= [
-      "debug/stack_trace_posix.cc",
-    ]
+    sources -= [ "debug/stack_trace_posix.cc" ]
   }
 
   if (is_chromeos) {
-    sources -= [
-      "power_monitor/power_monitor_device_source_posix.cc",
-    ]
+    sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ]
   }
 
   if (is_nacl) {
     # These things would otherwise be built on a Posix build but aren't
     # supported on NaCl.
     sources -= [
       "debug/stack_trace_posix.cc",
       "files/file_enumerator_posix.cc",
       "files/file_util_posix.cc",
       "message_loop/message_pump_libevent.cc",
@@ skipping 16 matching lines @@
       "memory/shared_memory_nacl.cc",
     ]
   }
 
   # Windows.
   if (is_win) {
     sources -= [
       "event_recorder_stubs.cc",
       "message_loop/message_pump_libevent.cc",
       "strings/string16.cc",
+
       # Not using sha1_win.cc because it may have caused a
       # regression to page cycler moz.
       "sha1_win.cc",
     ]
 
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]
 
     libs = [
       "cfgmgr32.lib",
       "netapi32.lib",
       "powrprof.lib",
       "setupapi.lib",
     ]
     ldflags = [
       "/DELAYLOAD:cfgmgr32.dll",
       "/DELAYLOAD:powrprof.dll",
       "/DELAYLOAD:setupapi.dll",
     ]
   } else if (!is_nacl) {
     # Non-Windows.
     deps += [ "//third_party/libevent" ]
   }
 
   # Mac.
   if (is_mac) {
     sources += [
-       "memory/discardable_memory_mach.cc",
-       "memory/discardable_memory_mach.h",
+      "memory/discardable_memory_mach.cc",
+      "memory/discardable_memory_mach.h",
     ]
     sources -= [
       "base_paths_posix.cc",
       "native_library_posix.cc",
       "strings/sys_string_conversions_posix.cc",
     ]
     deps += [ "//third_party/mach_override" ]
   } else {
     # Non-Mac.
     sources -= [
       "files/file_path_watcher_fsevents.cc",
       "files/file_path_watcher_fsevents.h",
       "files/file_path_watcher_kqueue.cc",
       "files/file_path_watcher_kqueue.h",
     ]
   }
 
   # Linux.
   if (is_linux) {
     # TODO(brettw) this will need to be parameterized at some point.
-    linux_configs = [
-      "//build/config/linux:glib",
-    ]
+    linux_configs = [ "//build/config/linux:glib" ]
 
     configs += linux_configs
     all_dependent_configs = linux_configs
 
     defines += [ "USE_SYMBOLIZE" ]
 
     # These dependencies are not required on Android, and in the case
     # of xdg_mime must be excluded due to licensing restrictions.
     deps += [
       "//base/third_party/symbolize",
@@ skipping 141 matching lines @@
     "prefs/pref_value_store.h",
     "prefs/scoped_user_pref_update.cc",
     "prefs/scoped_user_pref_update.h",
     "prefs/value_map_pref_store.cc",
     "prefs/value_map_pref_store.h",
     "prefs/writeable_pref_store.h",
   ]
 
   defines = [ "BASE_PREFS_IMPLEMENTATION" ]
 
-  deps = [ ":base" ]
+  deps = [
+    ":base",
+  ]
 
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 }
 
 source_set("prefs_test_support") {
   testonly = true
   sources = [
     "prefs/mock_pref_change_callback.cc",
     "prefs/mock_pref_change_callback.h",
     "prefs/pref_store_observer_mock.cc",
     "prefs/pref_store_observer_mock.h",
     "prefs/testing_pref_service.cc",
     "prefs/testing_pref_service.h",
     "prefs/testing_pref_store.cc",
     "prefs/testing_pref_store.h",
   ]
 
+  public_deps = [
+    ":prefs",
+  ]
   deps = [
     ":base",
-    ":prefs",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 source_set("message_loop_tests") {
   testonly = true
   sources = [
     "message_loop/message_loop_test.cc",
     "message_loop/message_loop_test.h",
   ]
 
   deps = [
     ":base",
     "//testing/gtest",
   ]
 }
 
 # TODO(pasko): Remove this target when crbug.com/424562 is fixed.
 source_set("protect_file_posix") {
   sources = [
     "files/protect_file_posix.cc",
   ]
 }
 
 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/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",
@@ skipping 265 matching lines @@
   if (!is_linux || use_ozone) {
     sources -= [ "message_loop/message_pump_glib_unittest.cc" ]
   }
 
   if (is_posix || is_ios) {
     sources += [ "message_loop/message_pump_libevent_unittest.cc" ]
     deps += [ "//third_party/libevent" ]
   }
 
   if (is_android) {
-    deps += [
-      "//testing/android:native_test_native_code",
-    ]
+    deps += [ "//testing/android:native_test_native_code" ]
     set_sources_assignment_filter([])
     sources += [ "debug/proc_maps_linux_unittest.cc" ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
   if (is_win) {
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
     cflags = [ "/wd4267" ]
   }
 }
@@ skipping 27 matching lines @@
   }
 
   # GYP: //base.gyp:base_java
   android_library("base_java") {
     srcjar_deps = [
       ":base_android_java_enums_srcjar",
       ":base_native_libraries_gen",
     ]
 
     deps = [
-      "//third_party/jsr-305:jsr_305_javalib"
+      "//third_party/jsr-305:jsr_305_javalib",
     ]
 
     DEPRECATED_java_in_dir = "android/java/src"
 
     # A new version of NativeLibraries.java (with the actual correct values)
     # will be created when creating an apk.
     jar_excluded_patterns = [
       "*/NativeLibraries.class",
       "*/NativeLibraries##*.class",
     ]
@@ skipping 35 matching lines @@
   # GYP: //base/base.gyp:base_native_libraries_gen
   java_cpp_template("base_native_libraries_gen") {
     sources = [
       "android/java/templates/NativeLibraries.template",
     ]
     package_name = "org/chromium/base/library_loader"
   }
 
   # 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"
+    deps = [
+      ":base_java",
     ]
+    java_files =
+        [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 
   # GYP: //base.gyp:base_unittests_apk
   unittest_apk("base_unittests_apk") {
     deps = [
       ":base_java",
       ":base_java_unittest_support",
       ":base_unittests",
     ]
     unittests_dep = ":base_unittests"
   }
 }