Reland of 'Move content/browser/power_save_blocker to //device/power_save_blocker'

content/content_browser.gypi

Index: content/content_browser.gypi
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index c01062ffce53928d55a44d5305bb4e4b430dcbe3..09ded704ad3d2877d07d8f987838b66f1814ee42 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -18,6 +18,7 @@
     '../device/battery/battery.gyp:device_battery_mojo_bindings',
     '../device/bluetooth/bluetooth.gyp:device_bluetooth',
     '../device/usb/usb.gyp:device_usb',
+    '../device/power_save_blocker/power_save_blocker.gyp:device_power_save_blocker',
     '../device/vibration/vibration.gyp:device_vibration',
     '../device/vibration/vibration.gyp:device_vibration_mojo_bindings',
     '../gin/gin.gyp:gin',
@@ -102,6 +103,7 @@
   ],
   'variables': {
     'public_browser_sources': [
+      'browser/power_save_blocker_factory.h',
       'public/browser/access_token_store.h',
       'public/browser/android/browser_media_player_manager_register.cc',
       'public/browser/android/browser_media_player_manager_register.h',
@@ -253,8 +255,6 @@
       'public/browser/plugin_data_remover.h',
       'public/browser/plugin_service.h',
       'public/browser/plugin_service_filter.h',
-      'public/browser/power_save_blocker.h',
-      'public/browser/power_save_blocker_factory.h',
       'public/browser/presentation_screen_availability_listener.h',
       'public/browser/presentation_service_delegate.h',
       'public/browser/presentation_session.cc',
@@ -1174,15 +1174,7 @@
       'browser/permissions/permission_service_impl.h',
       'browser/power_monitor_message_broadcaster.cc',
       'browser/power_monitor_message_broadcaster.h',
-      'browser/power_save_blocker_android.h',
-      'browser/power_save_blocker_chromeos.cc',
       'browser/power_save_blocker_factory.cc',
-      'browser/power_save_blocker_impl.cc',
-      'browser/power_save_blocker_impl.h',
-      'browser/power_save_blocker_mac.cc',
-      'browser/power_save_blocker_ozone.cc',
-      'browser/power_save_blocker_win.cc',
-      'browser/power_save_blocker_x11.cc',
       'browser/power_usage_monitor_impl.cc',
       'browser/power_usage_monitor_impl.h',
       'browser/presentation/presentation_service_impl.cc',
@@ -1710,7 +1702,6 @@
       'browser/android/tracing_controller_android.h',
       'browser/android/web_contents_observer_proxy.cc',
       'browser/android/web_contents_observer_proxy.h',
-      'browser/power_save_blocker_android.cc',
       'browser/renderer_host/compositor_impl_android.cc',
       'browser/renderer_host/compositor_impl_android.h',
       'browser/renderer_host/ime_adapter_android.cc',
@@ -1766,8 +1757,8 @@
       'browser/compositor/browser_compositor_output_surface.h',
       'browser/compositor/gpu_browser_compositor_output_surface.cc',
       'browser/compositor/gpu_browser_compositor_output_surface.h',
-      'browser/compositor/gpu_output_surface_mac.mm',
       'browser/compositor/gpu_output_surface_mac.h',
+      'browser/compositor/gpu_output_surface_mac.mm',
       'browser/compositor/gpu_process_transport_factory.cc',
       'browser/compositor/gpu_process_transport_factory.h',
       'browser/compositor/gpu_surfaceless_browser_compositor_output_surface.cc',
@@ -2111,8 +2102,6 @@
       'sources!': [
         'browser/device_sensors/data_fetcher_shared_memory_default.cc',
         'browser/geolocation/wifi_data_provider_linux.cc',
-        'browser/power_save_blocker_ozone.cc',
-        'browser/power_save_blocker_x11.cc',
       ],
     }],
     ['os_bsd==1', {