Revert of Aura on Android: content/browser

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',
     '../components/url_formatter/url_formatter.gyp:url_formatter',
     '../crypto/crypto.gyp:crypto',
     '../device/battery/battery.gyp:device_battery',
@@ skipping 301 matching lines @@
       '<(SHARED_INTERMEDIATE_DIR)/blink/grit/devtools_resources_map.h',
       # These files are generated by devtools_protocol_handler_generator.py.
       '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.cc',
       '<(SHARED_INTERMEDIATE_DIR)/content/browser/devtools/protocol/devtools_protocol_dispatcher.h',
       '<(SHARED_INTERMEDIATE_DIR)/content/browser/tracing/grit/tracing_resources.h',
       '<(SHARED_INTERMEDIATE_DIR)/ui/resources/grit/webui_resources_map.cc',
       'browser/accessibility/accessibility_mode_helper.cc',
       'browser/accessibility/accessibility_mode_helper.h',
       'browser/accessibility/accessibility_tree_formatter.cc',
       'browser/accessibility/accessibility_tree_formatter.h',
+      'browser/accessibility/accessibility_tree_formatter_android.cc',
       'browser/accessibility/accessibility_tree_formatter_blink.cc',
       'browser/accessibility/accessibility_tree_formatter_blink.h',
       'browser/accessibility/accessibility_tree_formatter_mac.mm',
       'browser/accessibility/accessibility_tree_formatter_stub.cc',
       'browser/accessibility/accessibility_tree_formatter_utils_win.cc',
       'browser/accessibility/accessibility_tree_formatter_utils_win.h',
       'browser/accessibility/accessibility_tree_formatter_win.cc',
       'browser/accessibility/accessibility_ui.cc',
       'browser/accessibility/accessibility_ui.h',
       'browser/accessibility/ax_tree_id_registry.cc',
       'browser/accessibility/ax_tree_id_registry.h',
       'browser/accessibility/browser_accessibility.cc',
       'browser/accessibility/browser_accessibility.h',
+      'browser/accessibility/browser_accessibility_android.cc',
+      'browser/accessibility/browser_accessibility_android.h',
       'browser/accessibility/browser_accessibility_cocoa.h',
       'browser/accessibility/browser_accessibility_cocoa.mm',
       'browser/accessibility/browser_accessibility_mac.h',
       'browser/accessibility/browser_accessibility_mac.mm',
       'browser/accessibility/browser_accessibility_manager.cc',
       'browser/accessibility/browser_accessibility_manager.h',
+      'browser/accessibility/browser_accessibility_manager_android.cc',
+      'browser/accessibility/browser_accessibility_manager_android.h',
       'browser/accessibility/browser_accessibility_manager_mac.h',
       'browser/accessibility/browser_accessibility_manager_mac.mm',
       'browser/accessibility/browser_accessibility_manager_win.cc',
       'browser/accessibility/browser_accessibility_manager_win.h',
       'browser/accessibility/browser_accessibility_state_impl.cc',
       'browser/accessibility/browser_accessibility_state_impl.h',
       'browser/accessibility/browser_accessibility_state_impl_win.cc',
       'browser/accessibility/browser_accessibility_win.cc',
       'browser/accessibility/browser_accessibility_win.h',
       'browser/accessibility/one_shot_accessibility_tree_search.cc',
       'browser/accessibility/one_shot_accessibility_tree_search.h',
       'browser/android/background_sync_network_observer_android.cc',
       'browser/android/background_sync_network_observer_android.h',
       'browser/android/browser_jni_registrar.cc',
       'browser/android/browser_jni_registrar.h',
       'browser/android/browser_startup_controller.cc',
       'browser/android/browser_startup_controller.h',
       'browser/android/browser_surface_texture_manager.cc',
       'browser/android/browser_surface_texture_manager.h',
       'browser/android/child_process_launcher_android.cc',
       'browser/android/child_process_launcher_android.h',
+      'browser/android/composited_touch_handle_drawable.cc',
+      'browser/android/composited_touch_handle_drawable.h',
       'browser/android/content_protocol_handler_impl.cc',
       'browser/android/content_protocol_handler_impl.h',
       'browser/android/content_startup_flags.cc',
       'browser/android/content_startup_flags.h',
       'browser/android/content_video_view.cc',
       'browser/android/content_video_view.h',
+      'browser/android/content_view_core_impl.cc',
+      'browser/android/content_view_core_impl.h',
+      'browser/android/content_view_render_view.cc',
+      'browser/android/content_view_render_view.h',
+      'browser/android/content_view_statics.cc',
+      'browser/android/content_view_statics.h',
+      'browser/android/date_time_chooser_android.cc',
+      'browser/android/date_time_chooser_android.h',
+      'browser/android/deferred_download_observer.cc',
+      'browser/android/deferred_download_observer.h',
       'browser/android/devtools_auth.cc',
+      'browser/android/download_controller_android_impl.cc',
+      'browser/android/download_controller_android_impl.h',
       'browser/android/in_process_surface_texture_manager.cc',
       'browser/android/in_process_surface_texture_manager.h',
+      'browser/android/interstitial_page_delegate_android.cc',
+      'browser/android/interstitial_page_delegate_android.h',
+      'browser/android/load_url_params.cc',
+      'browser/android/load_url_params.h',
       'public/browser/android/download_controller_android.h',
+      '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/tracing_controller_android.cc',
+      'browser/android/tracing_controller_android.h',
       'browser/android/url_request_content_job.cc',
       'browser/android/url_request_content_job.h',
+      'browser/android/web_contents_observer_proxy.cc',
+      'browser/android/web_contents_observer_proxy.h',
       'browser/appcache/appcache.cc',
       'browser/appcache/appcache.h',
       'browser/appcache/appcache_backend_impl.cc',
       'browser/appcache/appcache_backend_impl.h',
       'browser/appcache/appcache_database.cc',
       'browser/appcache/appcache_database.h',
       'browser/appcache/appcache_disk_cache.cc',
       'browser/appcache/appcache_disk_cache.h',
       'browser/appcache/appcache_dispatcher_host.cc',
       'browser/appcache/appcache_dispatcher_host.h',
@@ skipping 111 matching lines @@
       'browser/cert_store_impl.cc',
       'browser/cert_store_impl.h',
       'browser/child_process_launcher.cc',
       'browser/child_process_launcher.h',
       'browser/child_process_security_policy_impl.cc',
       'browser/child_process_security_policy_impl.h',
       'browser/cocoa/system_hotkey_helper_mac.h',
       'browser/cocoa/system_hotkey_helper_mac.mm',
       'browser/cocoa/system_hotkey_map.h',
       'browser/cocoa/system_hotkey_map.mm',
+      'browser/compositor/browser_compositor_overlay_candidate_validator_android.cc',

[mfomitchev, 2016/01/27 23:00:51]

@sivers: does this look okay to you? Seems a bit weird to have it here, but
compositor_browser_sources is not used on Android...

[no sievers, 2016/01/27 23:08:06]

You could also just leave the list with the android-specific sources - or rather
merge it into the existing 'android_browser_sources'.

[mfomitchev, 2016/01/28 00:20:31]

Done.

+      'browser/compositor/browser_compositor_overlay_candidate_validator_android.h',
       'browser/device_monitor_mac.h',
       'browser/device_monitor_mac.mm',
       'browser/device_monitor_udev.cc',
       'browser/device_monitor_udev.h',
       'browser/device_sensors/ambient_light_mac.cc',
       'browser/device_sensors/ambient_light_mac.h',
       'browser/device_sensors/data_fetcher_shared_memory.h',
       'browser/device_sensors/data_fetcher_shared_memory_android.cc',
       'browser/device_sensors/data_fetcher_shared_memory_base.cc',
       'browser/device_sensors/data_fetcher_shared_memory_base.h',
@@ skipping 572 matching lines @@
       'browser/notifications/page_notification_delegate.cc',
       'browser/notifications/page_notification_delegate.h',
       'browser/notifications/platform_notification_context_impl.cc',
       'browser/notifications/platform_notification_context_impl.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.cc',
       'browser/power_save_blocker_android.h',
       'browser/power_save_blocker_chromeos.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',
@@ skipping 10 matching lines @@
       'browser/push_messaging/push_messaging_router.cc',
       'browser/push_messaging/push_messaging_router.h',
       'browser/quota_dispatcher_host.cc',
       'browser/quota_dispatcher_host.h',
       'browser/renderer_data_memoizing_store.h',
       'browser/renderer_host/begin_frame_observer_proxy.cc',
       'browser/renderer_host/begin_frame_observer_proxy.h',
       'browser/renderer_host/clipboard_message_filter.cc',
       'browser/renderer_host/clipboard_message_filter.h',
       'browser/renderer_host/clipboard_message_filter_mac.mm',
+      'browser/renderer_host/compositor_impl_android.cc',
+      'browser/renderer_host/compositor_impl_android.h',
       'browser/renderer_host/compositor_resize_lock_aura.cc',
       'browser/renderer_host/compositor_resize_lock_aura.h',
       'browser/renderer_host/database_message_filter.cc',
       'browser/renderer_host/database_message_filter.h',
       'browser/renderer_host/delegated_frame_evictor.cc',
       'browser/renderer_host/delegated_frame_evictor.h',
       'browser/renderer_host/dip_util.cc',
       'browser/renderer_host/dip_util.h',
       'browser/renderer_host/dwrite_font_proxy_message_filter_win.cc',
       'browser/renderer_host/dwrite_font_proxy_message_filter_win.h',
       'browser/renderer_host/event_with_latency_info.h',
       'browser/renderer_host/file_utilities_message_filter.cc',
       'browser/renderer_host/file_utilities_message_filter.h',
       'browser/renderer_host/font_utils_linux.cc',
       'browser/renderer_host/font_utils_linux.h',
       'browser/renderer_host/frame_metadata_util.cc',
       'browser/renderer_host/frame_metadata_util.h',
       'browser/renderer_host/gamepad_browser_message_filter.cc',
       'browser/renderer_host/gamepad_browser_message_filter.h',
       'browser/renderer_host/gpu_message_filter.cc',
       'browser/renderer_host/gpu_message_filter.h',
+      'browser/renderer_host/ime_adapter_android.cc',
+      'browser/renderer_host/ime_adapter_android.h',
       'browser/renderer_host/input/gesture_event_queue.cc',
       'browser/renderer_host/input/gesture_event_queue.h',
       'browser/renderer_host/input/input_ack_handler.h',
       'browser/renderer_host/input/input_router.h',
       'browser/renderer_host/input/input_router_client.h',
       'browser/renderer_host/input/input_router_config_helper.cc',
       'browser/renderer_host/input/input_router_config_helper.h',
       'browser/renderer_host/input/input_router_impl.cc',
       'browser/renderer_host/input/input_router_impl.h',
       'browser/renderer_host/input/motion_event_web.cc',
       'browser/renderer_host/input/motion_event_web.h',
       'browser/renderer_host/input/mouse_wheel_event_queue.cc',
       'browser/renderer_host/input/mouse_wheel_event_queue.h',
       'browser/renderer_host/input/mouse_wheel_rails_filter_mac.cc',
       'browser/renderer_host/input/mouse_wheel_rails_filter_mac.h',
       'browser/renderer_host/input/render_widget_host_latency_tracker.cc',
       'browser/renderer_host/input/render_widget_host_latency_tracker.h',
       'browser/renderer_host/input/stylus_text_selector.cc',
       'browser/renderer_host/input/stylus_text_selector.h',
       'browser/renderer_host/input/synthetic_gesture.cc',
       'browser/renderer_host/input/synthetic_gesture.h',
       'browser/renderer_host/input/synthetic_gesture_controller.cc',
       'browser/renderer_host/input/synthetic_gesture_controller.h',
       'browser/renderer_host/input/synthetic_gesture_target.h',
+      'browser/renderer_host/input/synthetic_gesture_target_android.cc',
+      'browser/renderer_host/input/synthetic_gesture_target_android.h',
       'browser/renderer_host/input/synthetic_gesture_target_aura.cc',
       'browser/renderer_host/input/synthetic_gesture_target_aura.h',
       'browser/renderer_host/input/synthetic_gesture_target_base.cc',
       'browser/renderer_host/input/synthetic_gesture_target_base.h',
       'browser/renderer_host/input/synthetic_gesture_target_mac.h',
       'browser/renderer_host/input/synthetic_gesture_target_mac.mm',
       'browser/renderer_host/input/synthetic_mouse_pointer.cc',
       'browser/renderer_host/input/synthetic_mouse_pointer.h',
       'browser/renderer_host/input/synthetic_pinch_gesture.cc',
       'browser/renderer_host/input/synthetic_pinch_gesture.h',
@@ skipping 77 matching lines @@
       'browser/renderer_host/media/video_capture_controller.h',
       'browser/renderer_host/media/video_capture_controller_event_handler.h',
       'browser/renderer_host/media/video_capture_device_client.cc',
       'browser/renderer_host/media/video_capture_device_client.h',
       'browser/renderer_host/media/video_capture_gpu_jpeg_decoder.cc',
       'browser/renderer_host/media/video_capture_gpu_jpeg_decoder.h',
       'browser/renderer_host/media/video_capture_host.cc',
       'browser/renderer_host/media/video_capture_host.h',
       'browser/renderer_host/media/video_capture_manager.cc',
       'browser/renderer_host/media/video_capture_manager.h',
+      'browser/renderer_host/native_web_keyboard_event_android.cc',
       'browser/renderer_host/native_web_keyboard_event_aura.cc',
       'browser/renderer_host/native_web_keyboard_event_mac.mm',
       'browser/renderer_host/overscroll_configuration.cc',
       'browser/renderer_host/overscroll_controller.cc',
       'browser/renderer_host/overscroll_controller.h',
       'browser/renderer_host/overscroll_controller_delegate.h',
       'browser/renderer_host/render_message_filter.cc',
       'browser/renderer_host/render_message_filter.h',
       'browser/renderer_host/render_process_host_impl.cc',
       'browser/renderer_host/render_process_host_impl.h',
       'browser/renderer_host/render_sandbox_host_linux.cc',
       'browser/renderer_host/render_sandbox_host_linux.h',
       'browser/renderer_host/render_view_host_delegate.cc',
       'browser/renderer_host/render_view_host_delegate.h',
       'browser/renderer_host/render_view_host_delegate_view.h',
       'browser/renderer_host/render_view_host_factory.cc',
       'browser/renderer_host/render_view_host_factory.h',
       'browser/renderer_host/render_view_host_impl.cc',
       'browser/renderer_host/render_view_host_impl.h',
       'browser/renderer_host/render_widget_helper.cc',
       'browser/renderer_host/render_widget_helper.h',
       'browser/renderer_host/render_widget_host_delegate.cc',
       'browser/renderer_host/render_widget_host_delegate.h',
       'browser/renderer_host/render_widget_host_impl.cc',
       'browser/renderer_host/render_widget_host_impl.h',
       'browser/renderer_host/render_widget_host_input_event_router.cc',
       'browser/renderer_host/render_widget_host_input_event_router.h',
       'browser/renderer_host/render_widget_host_owner_delegate.h',
+      'browser/renderer_host/render_widget_host_view_android.cc',
+      'browser/renderer_host/render_widget_host_view_android.h',
       'browser/renderer_host/render_widget_host_view_aura.cc',
       'browser/renderer_host/render_widget_host_view_aura.h',
       'browser/renderer_host/render_widget_host_view_base.cc',
       'browser/renderer_host/render_widget_host_view_base.h',
       'browser/renderer_host/render_widget_host_view_mac.h',
       'browser/renderer_host/render_widget_host_view_mac.mm',
       'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.h',
       'browser/renderer_host/render_widget_host_view_mac_dictionary_helper.mm',
       'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.h',
       'browser/renderer_host/render_widget_host_view_mac_editcommand_helper.mm',
@@ skipping 17 matching lines @@
       'browser/renderer_host/websocket_dispatcher_host.cc',
       'browser/renderer_host/websocket_dispatcher_host.h',
       'browser/renderer_host/websocket_host.cc',
       'browser/renderer_host/websocket_host.h',
       'browser/resolve_proxy_msg_helper.cc',
       'browser/resolve_proxy_msg_helper.h',
       'browser/resource_context_impl.cc',
       'browser/resource_context_impl.h',
       'browser/safe_util_win.cc',
       'browser/safe_util_win.h',
+      'browser/screen_orientation/screen_orientation_delegate_android.cc',
+      'browser/screen_orientation/screen_orientation_delegate_android.h',
       'browser/screen_orientation/screen_orientation_dispatcher_host_impl.cc',
       'browser/screen_orientation/screen_orientation_dispatcher_host_impl.h',
+      'browser/screen_orientation/screen_orientation_message_filter_android.cc',
+      'browser/screen_orientation/screen_orientation_message_filter_android.h',
       'browser/service_worker/embedded_worker_instance.cc',
       'browser/service_worker/embedded_worker_instance.h',
       'browser/service_worker/embedded_worker_registry.cc',
       'browser/service_worker/embedded_worker_registry.h',
       'browser/service_worker/foreign_fetch_request_handler.cc',
       'browser/service_worker/foreign_fetch_request_handler.h',
       'browser/service_worker/service_worker_cache_writer.cc',
       'browser/service_worker/service_worker_cache_writer.h',
       'browser/service_worker/service_worker_client_utils.cc',
       'browser/service_worker/service_worker_client_utils.h',
@@ skipping 184 matching lines @@
       'browser/web_contents/aura/gesture_nav_simple.cc',
       'browser/web_contents/aura/gesture_nav_simple.h',
       'browser/web_contents/aura/overscroll_navigation_overlay.cc',
       'browser/web_contents/aura/overscroll_navigation_overlay.h',
       'browser/web_contents/aura/overscroll_window_animation.cc',
       'browser/web_contents/aura/overscroll_window_animation.h',
       'browser/web_contents/aura/overscroll_window_delegate.cc',
       'browser/web_contents/aura/overscroll_window_delegate.h',
       'browser/web_contents/aura/shadow_layer_delegate.cc',
       'browser/web_contents/aura/shadow_layer_delegate.h',
+      'browser/web_contents/web_contents_android.cc',
+      'browser/web_contents/web_contents_android.h',
       'browser/web_contents/web_contents_impl.cc',
       'browser/web_contents/web_contents_impl.h',
       'browser/web_contents/web_contents_view.h',
+      'browser/web_contents/web_contents_view_android.cc',
+      'browser/web_contents/web_contents_view_android.h',
       'browser/web_contents/web_contents_view_aura.cc',
       'browser/web_contents/web_contents_view_aura.h',
       'browser/web_contents/web_contents_view_guest.cc',
       'browser/web_contents/web_contents_view_guest.h',
       'browser/web_contents/web_contents_view_mac.h',
       'browser/web_contents/web_contents_view_mac.mm',
       'browser/web_contents/web_drag_dest_mac.h',
       'browser/web_contents/web_drag_dest_mac.mm',
       'browser/web_contents/web_drag_source_mac.h',
       'browser/web_contents/web_drag_source_mac.mm',
@@ skipping 58 matching lines @@
       'browser/android/in_process/synchronous_compositor_impl.h',
       'browser/android/in_process/synchronous_compositor_registry_in_proc.cc',
       'browser/android/in_process/synchronous_compositor_registry_in_proc.h',
       'browser/android/in_process/synchronous_input_event_filter.cc',
       'browser/android/in_process/synchronous_input_event_filter.h',
       'browser/android/synchronous_compositor_base.cc',
       'browser/android/synchronous_compositor_base.h',
       'browser/android/synchronous_compositor_host.cc',
       'browser/android/synchronous_compositor_host.h',
     ],
-    'android_non_aura_browser_sources': [
-        'browser/accessibility/accessibility_tree_formatter_android.cc',
-        'browser/accessibility/browser_accessibility_android.cc',
-        'browser/accessibility/browser_accessibility_android.h',
-        'browser/accessibility/browser_accessibility_manager_android.cc',
-        'browser/accessibility/browser_accessibility_manager_android.h',
-        'browser/android/composited_touch_handle_drawable.cc',
-        'browser/android/composited_touch_handle_drawable.h',
-        'browser/android/content_view_core_impl.cc',
-        'browser/android/content_view_core_impl.h',
-        'browser/android/content_view_render_view.cc',
-        'browser/android/content_view_render_view.h',
-        'browser/android/content_view_statics.cc',
-        'browser/android/content_view_statics.h',
-        'browser/android/date_time_chooser_android.cc',
-        'browser/android/date_time_chooser_android.h',
-        'browser/android/deferred_download_observer.cc',
-        'browser/android/deferred_download_observer.h',
-        'browser/android/download_controller_android_impl.cc',
-        'browser/android/download_controller_android_impl.h',
-        'browser/android/interstitial_page_delegate_android.cc',
-        'browser/android/interstitial_page_delegate_android.h',
-        'browser/android/load_url_params.cc',
-        'browser/android/load_url_params.h',
-        '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/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/compositor/browser_compositor_overlay_candidate_validator_android.cc',
-        'browser/compositor/browser_compositor_overlay_candidate_validator_android.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',
-        'browser/screen_orientation/screen_orientation_delegate_android.h',
-        'browser/screen_orientation/screen_orientation_message_filter_android.cc',
-        'browser/screen_orientation/screen_orientation_message_filter_android.h',
-        'browser/web_contents/web_contents_android.cc',
-        'browser/web_contents/web_contents_android.h',
-        'browser/web_contents/web_contents_view_android.cc',
-        'browser/web_contents/web_contents_view_android.h',
-    ],
+
     'auralinux_browser_sources': [
       'browser/accessibility/accessibility_tree_formatter_auralinux.cc',
       'browser/accessibility/browser_accessibility_auralinux.cc',
       'browser/accessibility/browser_accessibility_auralinux.h',
       'browser/accessibility/browser_accessibility_manager_auralinux.cc',
       'browser/accessibility/browser_accessibility_manager_auralinux.h',
     ],
     'webrtc_browser_sources': [
       'browser/media/webrtc_internals.cc',
       'browser/media/webrtc_internals.h',
@@ skipping 16 matching lines @@
       'browser/renderer_host/p2p/socket_host_tcp_server.h',
       '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/browser_compositor_overlay_candidate_validator.h',
-      'browser/compositor/browser_compositor_overlay_candidate_validator_android.cc',

[mfomitchev, 2016/01/27 23:00:51]

@sievers: Does this seem okay (since compositor_browser_sources is not used on
Android)?

-      'browser/compositor/browser_compositor_overlay_candidate_validator_android.h',
       'browser/compositor/browser_compositor_overlay_candidate_validator_mac.h',
       'browser/compositor/browser_compositor_overlay_candidate_validator_mac.mm',
       'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.cc',
       'browser/compositor/browser_compositor_overlay_candidate_validator_ozone.h',
       'browser/compositor/browser_compositor_view_mac.h',
       'browser/compositor/browser_compositor_view_mac.mm',
       'browser/compositor/buffer_queue.cc',
       'browser/compositor/buffer_queue.h',
       'browser/compositor/delegated_frame_host.cc',
       'browser/compositor/delegated_frame_host.h',
@@ skipping 343 matching lines @@
           '-ljnigraphics',
         ],
       },
       'sources/': [
         ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default\\.cc$'],
         ['exclude', '^browser/geolocation/network_location_provider\\.(cc|h)$'],
         ['exclude', '^browser/geolocation/network_location_request\\.(cc|h)$'],
         ['exclude', '^browser/tracing/trace_uploader\\.(cc|h)$'],
         ['exclude', '^browser/tracing/tracing_ui\\.(cc|h)$'],
       ],
-      'sources': [ '<@(android_browser_sources)', ],
+      'sources': [
+        '<@(android_browser_sources)',
+        '<@(android_in_process_browser_sources)',
+      ],
       'sources!': [
         'browser/browser_ipc_logging.cc',
         'browser/geolocation/device_data_provider.cc',
         'browser/geolocation/empty_device_data_provider.cc',
         'browser/geolocation/wifi_data_provider_common.cc',
         'browser/power_usage_monitor_impl.cc',
         'browser/power_usage_monitor_impl.h',
+        'browser/renderer_host/begin_frame_observer_proxy.cc',
         'browser/renderer_host/native_web_keyboard_event.cc',
-      ],
-      'conditions': [
-        ['use_aura == 0', {
-          'sources': [
-            '<@(android_in_process_browser_sources)',
-            '<@(android_non_aura_browser_sources)',
-          ],
-          'sources!': [ 'browser/renderer_host/begin_frame_observer_proxy.cc', ],
-        }],
-      ],
+      ]
     }],
     ['OS=="mac"', {
       'sources/': [
         ['exclude', '^browser/device_sensors/data_fetcher_shared_memory_default.cc$'],
       ],
       'sources!': [
         'browser/geolocation/empty_wifi_data_provider.cc',
       ],
       'dependencies': [
         '../third_party/mozilla/mozilla.gyp:mozilla',
@@ skipping 111 matching lines @@
     ['enable_webvr==1 and OS=="android"', {
       'sources': [
         'browser/vr/android/cardboard/cardboard_vr_device.cc',
         'browser/vr/android/cardboard/cardboard_vr_device.h',
         'browser/vr/android/cardboard/cardboard_vr_device_provider.cc',
         'browser/vr/android/cardboard/cardboard_vr_device_provider.h',
       ],
     }],
   ],
 }