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 1563 matching lines @@
       'browser/zygote_host/zygote_communication_linux.h',
       'browser/zygote_host/zygote_communication_linux.cc',
       'browser/zygote_host/zygote_handle_linux.cc',
       'browser/zygote_host/zygote_host_impl_linux.cc',
       'browser/zygote_host/zygote_host_impl_linux.h',
       'zygote/zygote_linux.cc',
       'zygote/zygote_linux.h',
       'zygote/zygote_main_linux.cc',
     ],
     'android_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/java/gin_java_bound_object.cc',
       'browser/android/java/gin_java_bound_object.h',
       'browser/android/java/gin_java_bound_object_delegate.cc',
       'browser/android/java/gin_java_bound_object_delegate.h',
       'browser/android/java/gin_java_bridge_dispatcher_host.cc',
       'browser/android/java/gin_java_bridge_dispatcher_host.h',
       'browser/android/java/gin_java_bridge_message_filter.cc',
       'browser/android/java/gin_java_bridge_message_filter.h',
       'browser/android/java/gin_java_method_invocation_helper.cc',
       'browser/android/java/gin_java_method_invocation_helper.h',
       'browser/android/java/gin_java_script_to_java_types_coercion.cc',
       'browser/android/java/gin_java_script_to_java_types_coercion.h',
       'browser/android/java/java_bridge_thread.cc',
       'browser/android/java/java_bridge_thread.h',
       'browser/android/java/java_method.cc',
       'browser/android/java/java_method.h',
       'browser/android/java/java_type.cc',
       'browser/android/java/java_type.h',
       'browser/android/java/jni_helper.cc',
       'browser/android/java/jni_helper.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',
     ],
     'android_in_process_browser_sources': [
       'browser/android/in_process/context_provider_in_process.cc',
       'browser/android/in_process/context_provider_in_process.h',
       'browser/android/in_process/synchronous_compositor_factory_impl.cc',
       'browser/android/in_process/synchronous_compositor_factory_impl.h',
       'browser/android/in_process/synchronous_compositor_impl.cc',
       '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',
-      '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',
       ],
     }],
   ],
 }