aw: Ubercomp mega patch

android_webview/android_webview.gyp

Index: android_webview/android_webview.gyp
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp
index 420cd76e53ed44d857afb7181bfaeeb97a205981..d8fd181f24c361ff53f1d373c73790e86ade7ad8 100644
--- a/android_webview/android_webview.gyp
+++ b/android_webview/android_webview.gyp
@@ -100,6 +100,7 @@
         '../content/content.gyp:content_app_both',
         '../gpu/gpu.gyp:command_buffer_service',
         '../gpu/gpu.gyp:gles2_implementation',
+        '../gpu/gpu.gyp:gl_in_process_context',
         '../media/media.gyp:media',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
@@ -165,6 +166,9 @@
         'browser/gpu_memory_buffer_factory_impl.h',
         'browser/hardware_renderer.cc',
         'browser/hardware_renderer.h',
+        'browser/hardware_renderer_legacy.cc',
+        'browser/hardware_renderer_legacy.h',
+        'browser/hardware_renderer_interface.h',
         'browser/icon_helper.cc',
         'browser/icon_helper.h',
         'browser/input_stream.h',
@@ -186,6 +190,8 @@
         'browser/net/init_native_callback.h',
         'browser/net/input_stream_reader.cc',
         'browser/net/input_stream_reader.h',
+        'browser/parent_output_surface.cc',
+        'browser/parent_output_surface.h',
         'browser/renderer_host/aw_render_view_host_ext.cc',
         'browser/renderer_host/aw_render_view_host_ext.h',
         'browser/renderer_host/aw_resource_dispatcher_host_delegate.cc',
@@ -204,6 +210,8 @@
         'common/aw_hit_test_data.cc',
         'common/aw_hit_test_data.h',
         'common/aw_resource.h',
+        'common/aw_switches.cc',
+        'common/aw_switches.h',
         'common/devtools_instrumentation.h',
         'common/print_messages.cc',
         'common/print_messages.h',