Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
diff --git a/content/content_browser.gypi b/content/content_browser.gypi
index d70e151..8fcfbc3 100644
--- a/content/content_browser.gypi
+++ b/content/content_browser.gypi
@@ -10,7 +10,9 @@
'../google_apis/google_apis.gyp:google_apis',
'../net/net.gyp:net',
'../skia/skia.gyp:skia',
+ '../sql/sql.gyp:sql',
'../third_party/re2/re2.gyp:re2',
+ '../third_party/zlib/zlib.gyp:zip',
'../third_party/zlib/zlib.gyp:zlib',
'../ui/snapshot/snapshot.gyp:snapshot',
'../ui/ui.gyp:ui',
@@ -58,8 +60,11 @@
'public/browser/compositor_util.h',
'public/browser/content_browser_client.cc',
'public/browser/content_browser_client.h',
+ 'public/browser/cookie_store_factory.h',
'public/browser/devtools_agent_host.h',
'public/browser/devtools_client_host.h',
+ 'public/browser/devtools_external_agent_proxy.h',
+ 'public/browser/devtools_external_agent_proxy_delegate.h',
'public/browser/download_danger_type.h',
'public/browser/download_id.h',
'public/browser/devtools_frontend_host_delegate.h',
@@ -91,6 +96,8 @@
'public/browser/histogram_fetcher.h',
'public/browser/host_zoom_map.h',
'public/browser/indexed_db_context.h',
+ 'public/browser/indexed_db_info.cc',
+ 'public/browser/indexed_db_info.h',
'public/browser/interstitial_page.h',
'public/browser/invalidate_type.h',
'public/browser/javascript_dialog_manager.cc',
@@ -238,8 +245,8 @@
'browser/android/interstitial_page_delegate_android.h',
'browser/android/load_url_params.cc',
'browser/android/load_url_params.h',
- 'browser/android/media_player_manager_android.cc',
- 'browser/android/media_player_manager_android.h',
+ 'browser/android/media_player_manager_impl.cc',
+ 'browser/android/media_player_manager_impl.h',
'browser/android/media_resource_getter_impl.cc',
'browser/android/media_resource_getter_impl.h',
'browser/android/surface_texture_peer_browser_impl.cc',
@@ -304,6 +311,8 @@
'browser/devtools/devtools_agent_host_impl.h',
'browser/devtools/devtools_browser_target.cc',
'browser/devtools/devtools_browser_target.h',
+ 'browser/devtools/devtools_external_agent_proxy_impl.cc',
+ 'browser/devtools/devtools_external_agent_proxy_impl.h',
'browser/devtools/devtools_frontend_host.cc',
'browser/devtools/devtools_frontend_host.h',
'browser/devtools/devtools_http_handler_impl.cc',
@@ -318,10 +327,14 @@
'browser/devtools/devtools_protocol_constants.h',
'browser/devtools/devtools_tracing_handler.h',
'browser/devtools/devtools_tracing_handler.cc',
+ 'browser/devtools/ipc_devtools_agent_host.cc',
+ 'browser/devtools/ipc_devtools_agent_host.h',
'browser/devtools/render_view_devtools_agent_host.cc',
'browser/devtools/render_view_devtools_agent_host.h',
'browser/devtools/renderer_overrides_handler.cc',
'browser/devtools/renderer_overrides_handler.h',
+ 'browser/devtools/tethering_handler.h',
+ 'browser/devtools/tethering_handler.cc',
'browser/devtools/worker_devtools_manager.cc',
'browser/devtools/worker_devtools_manager.h',
'browser/devtools/worker_devtools_message_filter.cc',
@@ -335,6 +348,8 @@
'browser/device_orientation/data_fetcher.h',
'browser/device_orientation/data_fetcher_impl_android.cc',
'browser/device_orientation/data_fetcher_impl_android.h',
+ 'browser/device_orientation/data_fetcher_impl_win.cc',
+ 'browser/device_orientation/data_fetcher_impl_win.h',
'browser/device_orientation/device_data.h',
'browser/device_orientation/message_filter.cc',
'browser/device_orientation/message_filter.h',
@@ -522,16 +537,18 @@
'browser/in_process_webkit/browser_webkitplatformsupport_impl.h',
'browser/in_process_webkit/indexed_db_callbacks.cc',
'browser/in_process_webkit/indexed_db_callbacks.h',
- 'browser/in_process_webkit/indexed_db_context_impl.cc',
- 'browser/in_process_webkit/indexed_db_context_impl.h',
'browser/in_process_webkit/indexed_db_database_callbacks.cc',
'browser/in_process_webkit/indexed_db_database_callbacks.h',
'browser/in_process_webkit/indexed_db_dispatcher_host.cc',
'browser/in_process_webkit/indexed_db_dispatcher_host.h',
- 'browser/in_process_webkit/indexed_db_quota_client.cc',
- 'browser/in_process_webkit/indexed_db_quota_client.h',
'browser/in_process_webkit/webkit_thread.cc',
'browser/in_process_webkit/webkit_thread.h',
+ 'browser/indexed_db/indexed_db_context_impl.cc',
+ 'browser/indexed_db/indexed_db_context_impl.h',
+ 'browser/indexed_db/indexed_db_internals_ui.cc',
+ 'browser/indexed_db/indexed_db_internals_ui.h',
+ 'browser/indexed_db/indexed_db_quota_client.cc',
+ 'browser/indexed_db/indexed_db_quota_client.h',
'browser/loader/async_resource_handler.cc',
'browser/loader/async_resource_handler.h',
'browser/loader/buffered_resource_handler.cc',
@@ -542,8 +559,11 @@
'browser/loader/cross_site_resource_handler.h',
'browser/loader/doomed_resource_handler.cc',
'browser/loader/doomed_resource_handler.h',
+ 'browser/loader/global_routing_id.h',
'browser/loader/layered_resource_handler.cc',
'browser/loader/layered_resource_handler.h',
+ 'browser/loader/offline_policy.cc',
+ 'browser/loader/offline_policy.h',
'browser/loader/power_save_block_resource_throttle.cc',
'browser/loader/power_save_block_resource_throttle.h',
'browser/loader/redirect_to_file_resource_handler.cc',
@@ -577,7 +597,7 @@
'browser/loader/throttling_resource_handler.h',
'browser/loader/transfer_navigation_resource_throttle.cc',
'browser/loader/transfer_navigation_resource_throttle.h',
- 'browser/mach_broker_mac.cc',
+ 'browser/mach_broker_mac.mm',
'browser/mach_broker_mac.h',
'browser/media_devices_monitor.cc',
'browser/media/media_internals.cc',
@@ -599,6 +619,8 @@
'browser/mime_registry_message_filter.h',
'browser/net/browser_online_state_observer.cc',
'browser/net/browser_online_state_observer.h',
+ 'browser/net/sqlite_persistent_cookie_store.cc',
+ 'browser/net/sqlite_persistent_cookie_store.h',
'browser/net/view_blob_internals_job_factory.cc',
'browser/net/view_blob_internals_job_factory.h',
'browser/net/view_http_cache_job_factory.cc',
@@ -620,9 +642,9 @@
'browser/power_save_blocker_chromeos.cc',
'browser/power_save_blocker_impl.cc',
'browser/power_save_blocker_impl.h',
- 'browser/power_save_blocker_linux.cc',
'browser/power_save_blocker_mac.cc',
'browser/power_save_blocker_win.cc',
+ 'browser/power_save_blocker_x11.cc',
'browser/ppapi_plugin_process_host.cc',
'browser/ppapi_plugin_process_host.h',
'browser/profiler_controller_impl.cc',
@@ -648,6 +670,8 @@
'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/compositing_iosurface_context_mac.mm',
+ 'browser/renderer_host/compositing_iosurface_context_mac.h',
'browser/renderer_host/compositing_iosurface_mac.h',
'browser/renderer_host/compositing_iosurface_mac.mm',
'browser/renderer_host/compositing_iosurface_shader_programs_mac.cc',
@@ -729,6 +753,8 @@
'browser/renderer_host/media/web_contents_tracker.h',
'browser/renderer_host/media/web_contents_video_capture_device.cc',
'browser/renderer_host/media/web_contents_video_capture_device.h',
+ 'browser/renderer_host/media/webrtc_logging_handler_host.cc',
+ 'browser/renderer_host/media/webrtc_logging_handler_host.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.cc',
@@ -811,6 +837,8 @@
'browser/renderer_host/render_widget_host_view_mac.mm',
'browser/renderer_host/render_widget_host_view_win.cc',
'browser/renderer_host/render_widget_host_view_win.h',
+ 'browser/renderer_host/smooth_scroll_gesture_controller.cc',
+ 'browser/renderer_host/smooth_scroll_gesture_controller.h',
'browser/renderer_host/socket_stream_dispatcher_host.cc',
'browser/renderer_host/socket_stream_dispatcher_host.h',
'browser/renderer_host/socket_stream_host.cc',
@@ -925,6 +953,10 @@
'browser/user_metrics.cc',
'browser/utility_process_host_impl.cc',
'browser/utility_process_host_impl.h',
+ 'browser/web_contents/aura/image_window_delegate.cc',
+ 'browser/web_contents/aura/image_window_delegate.h',
+ 'browser/web_contents/aura/shadow_layer_delegate.cc',
+ 'browser/web_contents/aura/shadow_layer_delegate.h',
'browser/web_contents/debug_urls.cc',
'browser/web_contents/debug_urls.h',
'browser/web_contents/drag_utils_gtk.cc',
@@ -937,10 +969,14 @@
'browser/web_contents/navigation_entry_impl.h',
'browser/web_contents/render_view_host_manager.cc',
'browser/web_contents/render_view_host_manager.h',
+ 'browser/web_contents/touch_editable_impl_aura.cc',
+ 'browser/web_contents/touch_editable_impl_aura.h',
'browser/web_contents/web_contents_drag_win.cc',
'browser/web_contents/web_contents_drag_win.h',
'browser/web_contents/web_contents_impl.cc',
'browser/web_contents/web_contents_impl.h',
+ 'browser/web_contents/web_contents_screenshot_manager.cc',
+ 'browser/web_contents/web_contents_screenshot_manager.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',
@@ -1100,14 +1136,17 @@
'libraries': [
'-lcomctl32.lib',
'-ldinput8.lib',
+ '-ldwmapi.lib',
'-llocationapi.lib',
'-lsensorsapi.lib',
+ '-lportabledeviceguids.lib',
],
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [
'dinput8.dll',
'user32.dll',
+ 'dwmapi.dll',
],
},
},
@@ -1148,6 +1187,10 @@
['use_x11==1', {
'dependencies': [
'../build/linux/system.gyp:x11',
+ ],
+ }],
+ ['OS=="linux"', {
+ 'dependencies': [
'../build/linux/system.gyp:pangocairo',
],
}],
@@ -1169,11 +1212,6 @@
'browser/tracing/tracing_ui.cc',
'browser/tracing/tracing_ui.h',
],
- }, { # OS!="android"
- 'dependencies': [
- '../third_party/flac/flac.gyp:libflac',
- '../third_party/speex/speex.gyp:libspeex',
- ],
}],
['OS=="mac"', {
'sources': [
@@ -1190,6 +1228,11 @@
'dependencies': [
'../third_party/sudden_motion_sensor/sudden_motion_sensor.gyp:sudden_motion_sensor',
],
+ 'link_settings': {
+ 'libraries': [
+ '$(SDKROOT)/usr/lib/libbsm.dylib',
+ ],
+ },
}],
['chromeos==1', {
'dependencies': [
@@ -1197,7 +1240,7 @@
],
'sources!': [
'browser/geolocation/wifi_data_provider_linux.cc',
- 'browser/power_save_blocker_linux.cc',
+ 'browser/power_save_blocker_x11.cc',
'browser/renderer_host/gtk_key_bindings_handler.cc',
'browser/renderer_host/gtk_key_bindings_handler.h',
],
@@ -1223,6 +1266,7 @@
['use_aura==1', {
'dependencies': [
'../ui/aura/aura.gyp:aura',
+ '../ui/base/strings/ui_strings.gyp:ui_strings',
'../ui/compositor/compositor.gyp:compositor',
],
'sources/': [
@@ -1255,6 +1299,8 @@
['exclude', '^browser/renderer_host/software_output_device_x11.cc'],
['exclude', '^browser/renderer_host/software_output_device_x11.h'],
['exclude', '^browser/renderer_host/touchpad_tap_suppression_controller_aura.cc'],
+ ['exclude', '^browser/web_contents/touch_editable_impl_aura.cc'],
+ ['exclude', '^browser/web_contents/touch_editable_impl_aura.h'],
],
}],
['enable_plugins==1', {
@@ -1293,6 +1339,11 @@
'sources/': [
['exclude', '^browser/speech/'],
],
+ }, { # input_speech==1
+ 'dependencies': [
+ '../third_party/flac/flac.gyp:libflac',
+ '../third_party/speex/speex.gyp:libspeex',
+ ],
}],
['linux_use_libgps==1', {
'dependencies': [