Merge M54: "Implement base::PowerMonitor::IsOnBatteryPower() for OSX."

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.
 
 # HOW TO WRITE CONDITIONALS IN THIS FILE
 # ======================================
 #
 # In many other places, one would write a conditional that expresses all the
 # cases when a source file is used or unused, and then either add or subtract
 # it from the sources list in that case
@@ skipping 576 matching lines @@
     "posix/global_descriptors.cc",
     "posix/global_descriptors.h",
     "posix/safe_strerror.cc",
     "posix/safe_strerror.h",
     "posix/unix_domain_socket_linux.cc",
     "posix/unix_domain_socket_linux.h",
     "power_monitor/power_monitor.cc",
     "power_monitor/power_monitor.h",
     "power_monitor/power_monitor_device_source.cc",
     "power_monitor/power_monitor_device_source.h",
-    "power_monitor/power_monitor_device_source_android.cc",
-    "power_monitor/power_monitor_device_source_android.h",
-    "power_monitor/power_monitor_device_source_chromeos.cc",
-    "power_monitor/power_monitor_device_source_ios.mm",
-    "power_monitor/power_monitor_device_source_mac.mm",
-    "power_monitor/power_monitor_device_source_posix.cc",
-    "power_monitor/power_monitor_device_source_win.cc",
     "power_monitor/power_monitor_source.cc",
     "power_monitor/power_monitor_source.h",
     "power_monitor/power_observer.h",
     "process/internal_linux.cc",
     "process/internal_linux.h",
     "process/kill.cc",
     "process/kill.h",
     "process/kill_mac.cc",
     "process/kill_posix.cc",
     "process/kill_win.cc",
@@ skipping 445 matching lines @@
   }
 
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos || is_chromecast) {
     defines += [ "SYSTEM_NATIVE_UTF8" ]
   }
 
   # Android.
   if (is_android) {
-    sources -= [
-      "debug/stack_trace_posix.cc",
-      "power_monitor/power_monitor_device_source_posix.cc",
-    ]
+    sources -= [ "debug/stack_trace_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",
       "posix/unix_domain_socket_linux.cc",
+      "power_monitor/power_monitor_device_source_android.cc",
+      "power_monitor/power_monitor_device_source_android.h",
       "process/internal_linux.cc",
       "process/memory_linux.cc",
       "process/process_handle_linux.cc",
       "process/process_iterator_linux.cc",
       "process/process_metrics_linux.cc",
       "sys_info_linux.cc",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
 
     deps += [
       ":base_jni_headers",
       "//third_party/android_tools:cpu_features",
       "//third_party/ashmem",
     ]
 
     # Needs to be a public config so that dependent targets link against it as
     # well when doing a component build.
     public_configs = [ ":android_system_libs" ]
   }
 
   # Chromeos.
   if (is_chromeos) {
-    sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ]
+    sources += [ "power_monitor/power_monitor_device_source_chromeos.cc" ]
   }
 
   # NaCl.
   if (is_nacl) {
     # We reset sources_assignment_filter in order to explicitly include
     # the linux file (which would otherwise be filtered out).
     set_sources_assignment_filter([])
     sources += [
       "files/file_path_watcher_stub.cc",
       "process/process_metrics_nacl.cc",
@@ skipping 70 matching lines @@
       "os_compat_nacl.cc",
       "os_compat_nacl.h",
       "rand_util_nacl.cc",
       "synchronization/read_write_lock_nacl.cc",
     ]
   }
 
   # Windows.
   if (is_win) {
     sources += [
+      "power_monitor/power_monitor_device_source_win.cc",
       "profiler/win32_stack_frame_unwinder.cc",
       "profiler/win32_stack_frame_unwinder.h",
     ]
 
     sources -= [
       "message_loop/message_pump_libevent.cc",
       "strings/string16.cc",
     ]
 
     deps += [
@@ skipping 88 matching lines @@
       "winmm.lib",
     ]
     all_dependent_configs = [ ":base_win_linker_flags" ]
   } else if (!is_nacl || is_nacl_nonsfi) {
     # Non-Windows.
     deps += [ "//base/third_party/libevent" ]
   }
 
   # Desktop Mac.
   if (is_mac) {
+    sources += [ "power_monitor/power_monitor_device_source_mac.mm" ]
+
     libs = [
       "ApplicationServices.framework",
       "AppKit.framework",
       "bsm",
       "CoreFoundation.framework",
       "IOKit.framework",
       "Security.framework",
     ]
   }
 
@@ skipping 113 matching lines @@
       "mac/scoped_nsautorelease_pool.h",
       "mac/scoped_nsautorelease_pool.mm",
       "mac/scoped_nsobject.h",
       "mac/scoped_nsobject.mm",
       "mac/scoped_objc_class_swizzler.h",
       "mac/scoped_objc_class_swizzler.mm",
       "mac/scoped_typeref.h",
       "memory/shared_memory_posix.cc",
       "message_loop/message_pump_mac.h",
       "message_loop/message_pump_mac.mm",
+      "power_monitor/power_monitor_device_source_ios.mm",
       "process/memory_stubs.cc",
       "strings/sys_string_conversions_mac.mm",
       "threading/platform_thread_mac.mm",
       "time/time_mac.cc",
     ]
 
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
+  if (is_posix && !is_mac && !is_ios && !is_android && !is_chromeos) {
+    sources += [ "power_monitor/power_monitor_device_source_posix.cc" ]
+  }
+
   if (!use_glib) {
     sources -= [
       "message_loop/message_pump_glib.cc",
       "message_loop/message_pump_glib.h",
     ]
   }
 
   if (is_asan || is_lsan || is_msan || is_tsan) {
     data += [ "//tools/valgrind/asan/" ]
     if (is_win) {
@@ skipping 987 matching lines @@
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files = [
       "test/android/java/src/org/chromium/base/ContentUriTestUtils.java",
       "test/android/java/src/org/chromium/base/TestSystemMessageHandler.java",
     ]
   }
 }