Revert of Aura on Android: content/browser

content/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//content/browser/browser.gni")
 import("//media/media_options.gni")
 
 source_set("browser") {
@@ skipping 320 matching lines @@
   }
 
   if (use_pango) {
     configs += [ "//build/config/linux:pangocairo" ]
   }
 
   if (is_android) {
     sources += rebase_path(content_browser_gypi_values.android_browser_sources,
                            ".",
                            "//content")
+    sources += rebase_path(
+            content_browser_gypi_values.android_in_process_browser_sources,
+            ".",
+            "//content")
     sources -= [
       "browser_ipc_logging.cc",
       "device_sensors/data_fetcher_shared_memory_default.cc",
       "geolocation/network_location_provider.cc",
       "geolocation/network_location_provider.h",
       "geolocation/network_location_request.cc",
       "geolocation/network_location_request.h",
       "power_usage_monitor_impl.cc",
       "power_usage_monitor_impl.h",
+      "renderer_host/begin_frame_observer_proxy.cc",
       "tracing/tracing_ui.cc",
       "tracing/tracing_ui.h",
 
       # Android skips most, but not all, of the speech code.
       "speech/audio_buffer.cc",
       "speech/audio_buffer.h",
       "speech/audio_encoder.cc",
       "speech/audio_encoder.h",
       "speech/chunked_byte_buffer.cc",
       "speech/chunked_byte_buffer.h",
       "speech/endpointer/endpointer.cc",
       "speech/endpointer/endpointer.h",
       "speech/endpointer/energy_endpointer.cc",
       "speech/endpointer/energy_endpointer.h",
       "speech/endpointer/energy_endpointer_params.cc",
       "speech/endpointer/energy_endpointer_params.h",
       "speech/google_one_shot_remote_engine.cc",
       "speech/google_one_shot_remote_engine.h",
       "speech/google_streaming_remote_engine.cc",
       "speech/google_streaming_remote_engine.h",
       "speech/speech_recognition_engine.cc",
       "speech/speech_recognition_engine.h",
       "speech/speech_recognizer_impl.cc",
       "speech/speech_recognizer_impl.h",
     ]
-
-    if (!use_aura) {
-      sources += rebase_path(
-              content_browser_gypi_values.android_non_aura_browser_sources,
-              ".",
-              "//content")
-      sources += rebase_path(
-              content_browser_gypi_values.android_in_process_browser_sources,
-              ".",
-              "//content")
-      sources -= [ "renderer_host/begin_frame_observer_proxy.cc" ]
-    }
-
     deps -= [ "//device/battery" ]
     deps += [
       "//content/public/android:jni",
       "//media",
       "//media/mojo/interfaces",
       "//mojo/android:libsystem_java",
       "//ui/android",
     ]
     defines += [ "APPCACHE_USE_SIMPLE_CACHE" ]
     libs += [ "jnigraphics" ]
@@ skipping 154 matching lines @@
 
   if (enable_webvr && is_android) {
     sources += [
       "vr/android/cardboard/cardboard_vr_device.cc",
       "vr/android/cardboard/cardboard_vr_device.h",
       "vr/android/cardboard/cardboard_vr_device_provider.cc",
       "vr/android/cardboard/cardboard_vr_device_provider.h",
     ]
   }
 }