1 files changed, 54 insertions, 100 deletions
diff --git a/chromium/content/content_child.gypi b/chromium/content/content_child.gypi
index c51317f3c76..e32039d896c 100644
--- a/chromium/content/content_child.gypi
+++ b/chromium/content/content_child.gypi
@@ -5,15 +5,18 @@
 {
   'dependencies': [
     '../base/base.gyp:base',
+    '../components/mime_util/mime_util.gyp:mime_util',
     '../components/tracing.gyp:tracing',
+    '../components/webcrypto/webcrypto.gyp:webcrypto',
     '../mojo/mojo_base.gyp:mojo_environment_chromium',
     '../mojo/mojo_base.gyp:mojo_common_lib',
-    '../mojo/public/mojo_public.gyp:mojo_application_bindings',
     '../skia/skia.gyp:skia',
     '../ui/base/ui_base.gyp:ui_base',
+    '../ui/events/events.gyp:gestures_blink',
     '../ui/gfx/gfx.gyp:gfx',
     '../ui/gfx/gfx.gyp:gfx_geometry',
     '../url/url.gyp:url_lib',
+    'content_common_mojo_bindings.gyp:content_common_mojo_bindings',
   ],
   'include_dirs': [
     '..',
@@ -23,9 +26,11 @@
   ],
   'variables': {
     'public_child_sources': [
+      'public/child/child_thread.h',
       'public/child/image_decoder_utils.h',
       'public/child/request_peer.h',
       'public/child/resource_dispatcher_delegate.h',
+      'public/child/v8_value_converter.h',
     ],
     'private_child_sources': [
       'child/appcache/appcache_backend_proxy.cc',
@@ -37,8 +42,18 @@
       'child/appcache/web_application_cache_host_impl.cc',
       'child/appcache/web_application_cache_host_impl.h',
       'child/assert_matching_enums.cc',
+      'child/background_sync/background_sync_provider_thread_proxy.cc',
+      'child/background_sync/background_sync_provider_thread_proxy.h',
+      'child/background_sync/background_sync_provider.cc',
+      'child/background_sync/background_sync_provider.h',
+      'child/background_sync/background_sync_type_converters.cc',
+      'child/background_sync/background_sync_type_converters.h',
       'child/blink_platform_impl.cc',
       'child/blink_platform_impl.h',
+      'child/bluetooth/bluetooth_dispatcher.cc',
+      'child/bluetooth/bluetooth_dispatcher.h',
+      'child/bluetooth/bluetooth_message_filter.cc',
+      'child/bluetooth/bluetooth_message_filter.h',
       'child/bluetooth/web_bluetooth_impl.cc',
       'child/bluetooth/web_bluetooth_impl.h',
       'child/browser_font_resource_trusted.cc',
@@ -57,8 +72,8 @@
       'child/child_resource_message_filter.h',
       'child/child_shared_bitmap_manager.cc',
       'child/child_shared_bitmap_manager.h',
-      'child/child_thread.cc',
-      'child/child_thread.h',
+      'child/child_thread_impl.cc',
+      'child/child_thread_impl.h',
       'child/content_child_helpers.cc',
       'child/content_child_helpers.h',
       'child/database_util.cc',
@@ -101,10 +116,20 @@
       'child/mojo/mojo_application.h',
       'child/multipart_response_delegate.cc',
       'child/multipart_response_delegate.h',
+      'child/navigator_connect/navigator_connect_dispatcher.cc',
+      'child/navigator_connect/navigator_connect_dispatcher.h',
+      'child/navigator_connect/navigator_connect_provider.cc',
+      'child/navigator_connect/navigator_connect_provider.h',
+      'child/notifications/notification_data_conversions.cc',
+      'child/notifications/notification_data_conversions.h',
       'child/notifications/notification_dispatcher.cc',
       'child/notifications/notification_dispatcher.h',
+      'child/notifications/notification_image_loader.cc',
+      'child/notifications/notification_image_loader.h',
       'child/notifications/notification_manager.cc',
       'child/notifications/notification_manager.h',
+      'child/notifications/pending_notifications_tracker.cc',
+      'child/notifications/pending_notifications_tracker.h',
       'child/npapi/np_channel_base.cc',
       'child/npapi/np_channel_base.h',
       'child/npapi/npobject_base.h',
@@ -147,6 +172,12 @@
       'child/npapi/webplugin_ime_win.cc',
       'child/npapi/webplugin_ime_win.h',
       'child/npapi/webplugin_resource_client.h',
+      'child/permissions/permission_dispatcher.cc',
+      'child/permissions/permission_dispatcher.h',
+      'child/permissions/permission_dispatcher_thread_proxy.cc',
+      'child/permissions/permission_dispatcher_thread_proxy.h',
+      'child/permissions/permission_observers_registry.cc',
+      'child/permissions/permission_observers_registry.h',
       'child/plugin_message_generator.cc',
       'child/plugin_message_generator.h',
       'child/plugin_messages.h',
@@ -154,6 +185,10 @@
       'child/plugin_param_traits.h',
       'child/power_monitor_broadcast_source.cc',
       'child/power_monitor_broadcast_source.h',
+      'child/push_messaging/push_dispatcher.cc',
+      'child/push_messaging/push_dispatcher.h',
+      'child/push_messaging/push_provider.cc',
+      'child/push_messaging/push_provider.h',
       'child/quota_dispatcher.cc',
       'child/quota_dispatcher.h',
       'child/quota_message_filter.cc',
@@ -164,8 +199,8 @@
       'child/request_info.h',
       'child/resource_dispatcher.cc',
       'child/resource_dispatcher.h',
-      'child/resource_loader_bridge.cc',
-      'child/resource_loader_bridge.h',
+      'child/resource_scheduling_filter.cc',
+      'child/resource_scheduling_filter.h',
       'child/runtime_features.cc',
       'child/runtime_features.h',
       'child/scoped_child_process_reference.cc',
@@ -200,41 +235,26 @@
       'child/thread_safe_sender.h',
       'child/threaded_data_provider.cc',
       'child/threaded_data_provider.h',
+      'child/v8_value_converter_impl.cc',
+      'child/v8_value_converter_impl.h',
       'child/web_data_consumer_handle_impl.cc',
       'child/web_data_consumer_handle_impl.h',
       'child/web_database_observer_impl.cc',
       'child/web_database_observer_impl.h',
       'child/web_discardable_memory_impl.cc',
       'child/web_discardable_memory_impl.h',
-      'child/web_gesture_curve_impl.cc',
-      'child/web_gesture_curve_impl.h',
+      'child/web_memory_allocator_dump_impl.cc',
+      'child/web_memory_allocator_dump_impl.h',
+      'child/web_memory_dump_provider_adapter.cc',
+      'child/web_memory_dump_provider_adapter.h',
+      'child/web_process_memory_dump_impl.cc',
+      'child/web_process_memory_dump_impl.h',
       'child/web_url_loader_impl.cc',
       'child/web_url_loader_impl.h',
       'child/web_url_request_util.cc',
       'child/web_url_request_util.h',
       'child/webblobregistry_impl.cc',
       'child/webblobregistry_impl.h',
-      'child/webcrypto/algorithm_dispatch.cc',
-      'child/webcrypto/algorithm_dispatch.h',
-      'child/webcrypto/algorithm_implementation.cc',
-      'child/webcrypto/algorithm_implementation.h',
-      'child/webcrypto/algorithm_registry.cc',
-      'child/webcrypto/algorithm_registry.h',
-      'child/webcrypto/crypto_data.cc',
-      'child/webcrypto/crypto_data.h',
-      'child/webcrypto/generate_key_result.cc',
-      'child/webcrypto/generate_key_result.h',
-      'child/webcrypto/jwk.cc',
-      'child/webcrypto/jwk.h',
-      'child/webcrypto/platform_crypto.h',
-      'child/webcrypto/status.cc',
-      'child/webcrypto/status.h',
-      'child/webcrypto/structured_clone.cc',
-      'child/webcrypto/structured_clone.h',
-      'child/webcrypto/webcrypto_impl.cc',
-      'child/webcrypto/webcrypto_impl.h',
-      'child/webcrypto/webcrypto_util.cc',
-      'child/webcrypto/webcrypto_util.h',
       'child/webfallbackthemeengine_impl.cc',
       'child/webfallbackthemeengine_impl.h',
       'child/webfileutilities_impl.cc',
@@ -250,56 +270,12 @@
       'child/webthemeengine_impl_default.cc',
       'child/webthemeengine_impl_default.h',
       'child/webthemeengine_impl_mac.h',
-      'child/webthread_impl.cc',
-      'child/webthread_impl.h',
       'child/weburlresponse_extradata_impl.cc',
       'child/weburlresponse_extradata_impl.h',
       'child/worker_task_runner.cc',
       'child/worker_task_runner.h',
-      'child/worker_thread_task_runner.cc',
-      'child/worker_thread_task_runner.h',
-    ],
-    'webcrypto_nss_sources': [
-      'child/webcrypto/nss/aes_cbc_nss.cc',
-      'child/webcrypto/nss/aes_gcm_nss.cc',
-      'child/webcrypto/nss/aes_key_nss.cc',
-      'child/webcrypto/nss/aes_key_nss.h',
-      'child/webcrypto/nss/aes_kw_nss.cc',
-      'child/webcrypto/nss/hmac_nss.cc',
-      'child/webcrypto/nss/key_nss.cc',
-      'child/webcrypto/nss/key_nss.h',
-      'child/webcrypto/nss/rsa_key_nss.cc',
-      'child/webcrypto/nss/rsa_key_nss.h',
-      'child/webcrypto/nss/rsa_oaep_nss.cc',
-      'child/webcrypto/nss/rsa_ssa_nss.cc',
-      'child/webcrypto/nss/sha_nss.cc',
-      'child/webcrypto/nss/sym_key_nss.cc',
-      'child/webcrypto/nss/sym_key_nss.h',
-      'child/webcrypto/nss/util_nss.cc',
-      'child/webcrypto/nss/util_nss.h',
-    ],
-    'webcrypto_openssl_sources': [
-      'child/webcrypto/openssl/aes_cbc_openssl.cc',
-      'child/webcrypto/openssl/aes_ctr_openssl.cc',
-      'child/webcrypto/openssl/aes_gcm_openssl.cc',
-      'child/webcrypto/openssl/aes_key_openssl.cc',
-      'child/webcrypto/openssl/aes_key_openssl.h',
-      'child/webcrypto/openssl/aes_kw_openssl.cc',
-      'child/webcrypto/openssl/hmac_openssl.cc',
-      'child/webcrypto/openssl/key_openssl.cc',
-      'child/webcrypto/openssl/key_openssl.h',
-      'child/webcrypto/openssl/rsa_key_openssl.cc',
-      'child/webcrypto/openssl/rsa_key_openssl.h',
-      'child/webcrypto/openssl/rsa_oaep_openssl.cc',
-      'child/webcrypto/openssl/rsa_pss_openssl.cc',
-      'child/webcrypto/openssl/rsa_sign_openssl.cc',
-      'child/webcrypto/openssl/rsa_sign_openssl.h',
-      'child/webcrypto/openssl/rsa_ssa_openssl.cc',
-      'child/webcrypto/openssl/sha_openssl.cc',
-      'child/webcrypto/openssl/sym_key_openssl.cc',
-      'child/webcrypto/openssl/sym_key_openssl.h',
-      'child/webcrypto/openssl/util_openssl.cc',
-      'child/webcrypto/openssl/util_openssl.h',
+      'child/worker_thread_message_filter.cc',
+      'child/worker_thread_message_filter.h',
     ],
   },
   'sources': [
@@ -316,8 +292,8 @@
       }
     ],
     ['OS=="android"', {
-      'includes': [
-        '../build/android/cpufeatures.gypi',
+      'dependencies': [
+        '../build/android/ndk.gyp:cpu_features',
       ],
     }],
     ['enable_plugins==0', {
@@ -339,8 +315,10 @@
       'dependencies': [
         'app/resources/content_resources.gyp:content_resources',
         'app/strings/content_strings.gyp:content_strings',
+        '../components/scheduler/scheduler.gyp:scheduler',
         '../storage/storage_common.gyp:storage_common',
         '../third_party/WebKit/public/blink.gyp:blink',
+        '../third_party/WebKit/public/blink_resources.gyp:blink_image_resources',
         '../third_party/WebKit/public/blink_resources.gyp:blink_resources',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
@@ -355,29 +333,5 @@
         'child/npapi/webplugin_delegate_impl_aura.cc',
       ],
     }],
-    ['use_openssl==1', {
-      'sources': [
-        '<@(webcrypto_openssl_sources)',
-      ],
-      'dependencies': [
-        '../third_party/boringssl/boringssl.gyp:boringssl',
-      ],
-    }, {
-      'sources': [
-        '<@(webcrypto_nss_sources)',
-      ],
-      'conditions': [
-        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-          'dependencies': [
-            '../build/linux/system.gyp:ssl',
-          ],
-        }, {
-          'dependencies': [
-            '../third_party/nss/nss.gyp:nspr',
-            '../third_party/nss/nss.gyp:nss',
-          ],
-        }],
-      ],
-    }],
   ],
 }