Revert of Move content/browser/power_save_blocker to //device/power_save_blocker

content/content_browser.gypi

 # Copyright (c) 2012 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.
 
 {
   'dependencies': [
     '../base/base.gyp:base_static',
     '../cc/cc.gyp:cc',
     '../cc/cc.gyp:cc_surfaces',
     '../components/components.gyp:display_compositor',
     '../components/leveldb/leveldb.gyp:leveldb_lib',
     '../components/link_header_util/link_header_util.gyp:link_header_util',
     '../components/mime_util/mime_util.gyp:mime_util',
     '../components/scheduler/scheduler.gyp:scheduler_common',
     '../components/url_formatter/url_formatter.gyp:url_formatter',
     '../crypto/crypto.gyp:crypto',
     '../device/battery/battery.gyp:device_battery',
     '../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',
     '../google_apis/google_apis.gyp:google_apis',
     '../gpu/gpu.gyp:gpu',
     '../gpu/gpu.gyp:gpu_ipc_client',
     '../gpu/gpu.gyp:gpu_ipc_common',
     '../media/mojo/interfaces/mojo_bindings.gyp:image_capture_mojo_bindings',
     '../mojo/mojo_base.gyp:mojo_url_type_converters',
     '../mojo/mojo_public.gyp:mojo_cpp_bindings',
@@ skipping 64 matching lines @@
     # The public render_widget_host.h needs to re-export skia defines.
     '../skia/skia.gyp:skia',
     'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
   ],
   'include_dirs': [
     '..',
     '<(INTERMEDIATE_DIR)',
   ],
   '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',
       'public/browser/android/compositor.h',
       'public/browser/android/compositor_client.h',
       'public/browser/android/content_protocol_handler.h',
       'public/browser/android/content_view_core.h',
       'public/browser/android/content_view_layer_renderer.h',
       'public/browser/android/devtools_auth.h',
       'public/browser/android/download_controller_android.cc',
@@ skipping 132 matching lines @@
       'public/browser/page_navigator.cc',
       'public/browser/page_navigator.h',
       'public/browser/pepper_flash_settings_helper.h',
       'public/browser/permission_manager.h',
       'public/browser/permission_type.h',
       'public/browser/platform_notification_context.h',
       'public/browser/platform_notification_service.h',
       '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',
       'public/browser/presentation_session.h',
       'public/browser/presentation_session_message.cc',
       'public/browser/presentation_session_message.h',
       'public/browser/profiler_controller.h',
       'public/browser/profiler_subscriber.h',
       'public/browser/push_messaging_service.cc',
       'public/browser/push_messaging_service.h',
@@ skipping 901 matching lines @@
       'browser/notifications/platform_notification_context_impl.cc',
       'browser/notifications/platform_notification_context_impl.h',
       'browser/notifications/type_converters.cc',
       'browser/notifications/type_converters.h',
       'browser/permissions/permission_service_context.cc',
       'browser/permissions/permission_service_context.h',
       'browser/permissions/permission_service_impl.cc',
       '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',
       'browser/presentation/presentation_service_impl.h',
       'browser/presentation/presentation_type_converters.cc',
       'browser/presentation/presentation_type_converters.h',
       'browser/profiler_controller_impl.cc',
       'browser/profiler_controller_impl.h',
       'browser/profiler_message_filter.cc',
       'browser/profiler_message_filter.h',
@@ skipping 507 matching lines @@
       'browser/android/overscroll_controller_android.cc',
       'browser/android/overscroll_controller_android.h',
       'browser/android/popup_touch_handle_drawable.cc',
       'browser/android/popup_touch_handle_drawable.h',
       'browser/android/synchronous_compositor_host.cc',
       'browser/android/synchronous_compositor_host.h',
       'browser/android/tracing_controller_android.cc',
       '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',
       'browser/renderer_host/ime_adapter_android.h',
       'browser/renderer_host/input/synthetic_gesture_target_android.cc',
       'browser/renderer_host/input/synthetic_gesture_target_android.h',
       'browser/renderer_host/native_web_keyboard_event_android.cc',
       'browser/renderer_host/render_widget_host_view_android.cc',
       'browser/renderer_host/render_widget_host_view_android.h',
       'browser/screen_orientation/screen_orientation_delegate_android.cc',
@@ skipping 35 matching lines @@
       'browser/renderer_host/p2p/socket_host_throttler.cc',
       'browser/renderer_host/p2p/socket_host_throttler.h',
       'browser/renderer_host/p2p/socket_host_udp.cc',
       'browser/renderer_host/p2p/socket_host_udp.h',
     ],
     'compositor_browser_sources': [
       'browser/compositor/browser_compositor_output_surface.cc',
       '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',
       'browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h',
       'browser/compositor/image_transport_factory.cc',
       'browser/compositor/image_transport_factory.h',
       'browser/compositor/offscreen_browser_compositor_output_surface.cc',
       'browser/compositor/offscreen_browser_compositor_output_surface.h',
       'browser/compositor/owned_mailbox.cc',
       'browser/compositor/owned_mailbox.h',
@@ skipping 323 matching lines @@
     }],
     ['chromeos==1', {
       'dependencies': [
         '../build/linux/system.gyp:dbus',
         '../chromeos/chromeos.gyp:chromeos',
         '../chromeos/chromeos.gyp:power_manager_proto',
       ],
       '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', {
       'sources/': [
         ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
       ],
     }],
     ['use_aura==1', {
       'dependencies': [
         '../ui/aura/aura.gyp:aura',
@@ skipping 82 matching lines @@
       ],
     }],
     ['OS != "mac" and OS != "android"', {
       'sources!': [
         'browser/gpu/gpu_surface_tracker.cc',
         'browser/gpu/gpu_surface_tracker.h',
       ],
     }],
   ],
 }