From b2ee829ac493ae48d918522366fe69f5a90ce096 Mon Sep 17 00:00:00 2001
From: Rene Ladan <rene@FreeBSD.org>
Date: Wed, 8 Jun 2016 05:31:35 +0000
Subject: MFH: r416521

www/chromium: update to 51.0.2704.84

A lot of patch files are renamed in this update.

Submitted by:	Timothy Vaccarelli
Obtained from:	https://github.com/LeFroid/
Security:	http://vuxml.freebsd.org/freebsd/c039a761-2c29-11e6-8912-3065ec8fd3ec.html
Security:	http://vuxml.freebsd.org/freebsd/1a6bbb95-24b8-11e6-bd31-3065ec8fd3ec.html
Security:	http://vuxml.freebsd.org/freebsd/4dfafa16-24ba-11e6-bd31-3065ec8fd3ec.html
Security:	http://vuxml.freebsd.org/freebsd/7da1da96-24bb-11e6-bd31-3065ec8fd3ec.html
Security:	http://vuxml.freebsd.org/freebsd/6d8505f0-0614-11e6-b39c-00262d5ed8ee.html

Approved by:	ports-secteam (junovitch)
---
 www/chromium/Makefile                              |  42 ++-
 www/chromium/distinfo                              |   9 +-
 www/chromium/files/patch-base__base.gyp            |  23 --
 www/chromium/files/patch-base__base.gypi           |  20 --
 .../files/patch-base__debug__stack_trace_posix.cc  |  21 --
 .../patch-base__files__file_path_watcher_kqueue.h  |  13 -
 www/chromium/files/patch-base__move.h              |  11 -
 .../patch-base__posix__unix_domain_socket_linux.cc |  44 ---
 ...se__posix__unix_domain_socket_linux_unittest.cc |  18 -
 .../files/patch-base__process__internal_linux.h    |  11 -
 www/chromium/files/patch-base__process__launch.cc  |  16 -
 www/chromium/files/patch-base__process__launch.h   |  20 --
 www/chromium/files/patch-base__process__memory.cc  |  39 --
 .../files/patch-base__process__memory_stubs.cc     |  18 -
 .../files/patch-base__process__memory_unittest.cc  |  23 --
 .../patch-base__process__process_info_linux.cc     |  39 --
 ...atch-base__process__process_iterator_freebsd.cc |  36 --
 .../files/patch-base__process__process_metrics.h   |  34 --
 ...patch-base__process__process_metrics_freebsd.cc |  36 --
 .../files/patch-base__process__process_posix.cc    | 107 ------
 .../files/patch-base__security_unittest.cc         |  11 -
 .../files/patch-base__strings__safe_sprintf.cc     |  16 -
 www/chromium/files/patch-base__sys_info_freebsd.cc |  67 ----
 www/chromium/files/patch-base__sys_info_posix.cc   |  11 -
 .../patch-base__test__launcher__test_launcher.cc   |  13 -
 ...patch-base__threading__platform_thread_linux.cc |  21 --
 ...patch-base__trace_event__process_memory_dump.cc |  11 -
 .../patch-base__trace_event__process_memory_dump.h |  11 +
 www/chromium/files/patch-base_base.gyp             |  23 ++
 www/chromium/files/patch-base_base.gypi            |  20 ++
 .../files/patch-base_debug_stack__trace__posix.cc  |  21 ++
 .../patch-base_files_file__path__watcher__kqueue.h |  13 +
 www/chromium/files/patch-base_i18n_icu__util.cc    |  13 +
 www/chromium/files/patch-base_i18n_icu__util.h     |  13 +
 ...patch-base_posix_unix__domain__socket__linux.cc |  44 +++
 ..._posix_unix__domain__socket__linux__unittest.cc |  18 +
 .../files/patch-base_process_internal__linux.h     |  11 +
 www/chromium/files/patch-base_process_launch.cc    |  16 +
 www/chromium/files/patch-base_process_launch.h     |  20 ++
 www/chromium/files/patch-base_process_memory.cc    |  39 ++
 .../files/patch-base_process_memory__stubs.cc      |  18 +
 .../files/patch-base_process_memory__unittest.cc   |  23 ++
 .../patch-base_process_process__info__linux.cc     |  39 ++
 ...atch-base_process_process__iterator__freebsd.cc |  36 ++
 .../files/patch-base_process_process__metrics.h    |  34 ++
 ...patch-base_process_process__metrics__freebsd.cc |  36 ++
 .../files/patch-base_process_process__posix.cc     | 107 ++++++
 .../files/patch-base_security__unittest.cc         |  11 +
 .../files/patch-base_strings_safe__sprintf.cc      |  16 +
 .../files/patch-base_sys__info__freebsd.cc         |  67 ++++
 www/chromium/files/patch-base_sys__info__posix.cc  |  11 +
 .../patch-base_test_launcher_test__launcher.cc     |  13 +
 .../patch-base_third__party_libevent_libevent.gyp  |  83 +++++
 ...patch-base_threading_platform__thread__linux.cc |  21 ++
 ...patch-base_threading_platform__thread__posix.cc |  11 +
 ...atch-base_trace__event_process__memory__dump.cc |  11 +
 www/chromium/files/patch-build__common.gypi        |  67 ----
 .../files/patch-build__filename_rules.gypi         |  11 -
 www/chromium/files/patch-build__linux__system.gyp  |  16 -
 .../patch-build__linux__unbundle__libwebp.gyp      |  17 -
 www/chromium/files/patch-build_common.gypi         |  92 +++++
 .../files/patch-build_filename__rules.gypi         |  11 +
 www/chromium/files/patch-build_linux_system.gyp    |  16 +
 .../files/patch-build_linux_unbundle_libwebp.gyp   |  17 +
 www/chromium/files/patch-cc__layers__layer_impl.cc |  22 --
 .../patch-cc__layers__scrollbar_layer_impl_base.cc |  13 -
 ...patch-cc_layers_scrollbar__layer__impl__base.cc |  13 +
 .../files/patch-cc_trees_property__tree.cc         |  20 ++
 .../patch-chrome__app__chrome_main_delegate.cc     |  65 ----
 .../patch-chrome__app__chrome_main_delegate.h      |  11 -
 .../files/patch-chrome__app__chromium_strings.grd  |  11 -
 ...tch-chrome__app__resources__locale_settings.grd |  11 -
 .../patch-chrome__browser__browser_resources.grd   |  11 -
 .../patch-chrome__browser__chrome_browser_main.cc  |  29 --
 ...h-chrome__browser__chrome_browser_main_posix.cc |  22 --
 ...rome__browser__chrome_content_browser_client.cc |  38 --
 ...hrome__browser__chrome_content_browser_client.h |  11 -
 .../files/patch-chrome__browser__defaults.cc       |  11 -
 ...me__browser__diagnostics__diagnostics_writer.cc |  11 -
 ...ome__browser__diagnostics__diagnostics_writer.h |  11 -
 ...chrome__browser__download__download_commands.cc |  38 --
 ...-chrome__browser__download__download_commands.h |  12 -
 ...ch-chrome__browser__download__download_prefs.cc |  65 ----
 ...tch-chrome__browser__download__download_prefs.h |  20 --
 ...ch-chrome__browser__download__download_query.cc |  14 -
 ...owser__download__download_shelf_context_menu.cc |  11 -
 ...wser__extensions__activity_log__activity_log.cc |  14 -
 ...age_writer_private__image_writer_private_api.cc |  15 -
 ..._api__music_manager_private__device_id_linux.cc |  66 ----
 ...me__browser__extensions__window_open_apitest.cc |  11 -
 ...atch-chrome__browser__gpu__gl_string_manager.cc |  11 -
 ...ch-chrome__browser__gpu__gpu_feature_checker.cc |  11 -
 ...-chrome__browser__media__webrtc_log_uploader.cc |  11 -
 ...a_galleries__fileapi__mtp_device_map_service.cc |  15 -
 ..._media_galleries__media_file_system_registry.cc |  14 -
 ...rowser__media_galleries__media_folder_finder.cc |  15 -
 .../files/patch-chrome__browser__memory_details.cc |  29 --
 ...ics__chrome_browser_main_extra_parts_metrics.cc |  18 -
 ...cations__message_center_notification_manager.cc |  11 -
 ...word_manager__chrome_password_manager_client.cc |  14 -
 ...__browser__plugins__plugins_resource_service.cc |  11 -
 ...e__browser__policy__policy_prefs_browsertest.cc |  11 -
 ...tch-chrome__browser__process_singleton_posix.cc |  34 --
 ...h-chrome__browser__renderer_preferences_util.cc |  38 --
 ...g__incident_reporting__incident_handler_util.cc |  15 -
 ...ome__browser__search__local_files_ntp_source.cc |  16 -
 ...ch-chrome__browser__sync__chrome_sync_client.cc |  11 -
 ...me__browser__tracing__crash_service_uploader.cc |  11 -
 ...__aura__chrome_browser_main_extra_parts_aura.cc |  29 --
 ...i__aura__chrome_browser_main_extra_parts_aura.h |  11 -
 ...ome__browser__ui__browser_command_controller.cc |  38 --
 ...atch-chrome__browser__ui__browser_view_prefs.cc |  20 --
 ...i__exclusive_access__exclusive_access_bubble.cc |  11 -
 ...h-chrome__browser__ui__panels__panel_manager.cc |  11 -
 ...rowser__ui__startup__startup_browser_creator.cc |  11 -
 ...chrome__browser__ui__toolbar__app_menu_model.cc |  11 -
 ...browser__ui__view__tabs__tab_drag_controller.cc |  29 --
 ...s__apps__chrome_native_app_window_views_aura.cc |  20 --
 ...e__browser__ui__views__chrome_views_delegate.cc |  29 --
 ...me__browser__ui__views__chrome_views_delegate.h |  20 --
 ...chrome__browser__ui__views__first_run_dialog.cc |  20 --
 ...me__browser__ui__views__frame__browser_frame.cc |  20 --
 ..._ui__views__frame__opaque_browser_frame_view.cc |  20 --
 ...ews__frame__opaque_browser_frame_view_layout.cc |  11 -
 ..._opaque_browser_frame_view_platform_specific.cc |  11 -
 ..._ui__views__frame__system_menu_model_builder.cc |  20 --
 ...s__message_center__message_center_frame_view.cc |  11 -
 ...browser__ui__views__panels__panel_frame_view.cc |  11 -
 ...-chrome__browser__ui__views__tabs__tab_strip.cc |  11 -
 .../patch-chrome__browser__ui__webui__about_ui.cc  |  54 ---
 ..._ui__webui__chrome_web_ui_controller_factory.cc |  11 -
 ..._webui__extensions__extension_loader_handler.cc |  14 -
 ..._ui__webui__options__browser_options_handler.cc |  45 ---
 ...__ui__webui__options__browser_options_handler.h |  11 -
 ...h-chrome__browser__web_applications__web_app.cc |  11 -
 ...ch-chrome__browser__web_applications__web_app.h |  11 -
 .../files/patch-chrome__chrome_browser.gypi        |  43 ---
 .../patch-chrome__chrome_browser_extensions.gypi   |  14 -
 .../files/patch-chrome__chrome_browser_ui.gypi     |  33 --
 .../files/patch-chrome__chrome_common.gypi         |  13 -
 www/chromium/files/patch-chrome__chrome_exe.gypi   |  11 -
 .../files/patch-chrome__common__chrome_paths.cc    |  53 ---
 .../files/patch-chrome__common__chrome_paths.h     |  33 --
 .../patch-chrome__common__chrome_paths_internal.h  |  11 -
 .../files/patch-chrome__common__chrome_switches.cc |  18 -
 .../files/patch-chrome__common__chrome_switches.h  |  11 -
 ...rome__common__component_flash_hint_file_linux.h |  14 -
 .../patch-chrome__common__extensions__command.cc   |  11 -
 .../files/patch-chrome__common__pref_names.cc      |  20 --
 .../files/patch-chrome__common__pref_names.h       |  20 --
 ...mmon__variations__fieldtrial_testing_config.gyp |  11 -
 ...enderer__pepper__pepper_flash_font_file_host.cc |  38 --
 ...renderer__pepper__pepper_flash_font_file_host.h |  20 --
 ...-chrome__test__base__in_process_browser_test.cc |  13 -
 ...h-chrome__test__base__testing_browser_process.h |  13 -
 ...e__test__chromedriver__chrome__chrome_finder.cc |  20 --
 .../patch-chrome_app_chrome__main__delegate.cc     |  65 ++++
 .../patch-chrome_app_chrome__main__delegate.h      |  11 +
 .../files/patch-chrome_app_chromium__strings.grd   |  11 +
 .../patch-chrome_app_generated__resources.grd      |  11 +
 ...patch-chrome_app_resources_locale__settings.grd |  11 +
 .../files/patch-chrome_browser_about__flags.cc     |  20 ++
 .../patch-chrome_browser_browser__resources.grd    |  11 +
 .../patch-chrome_browser_chrome__browser__main.cc  |  25 ++
 ...-chrome_browser_chrome__browser__main__linux.cc |  27 ++
 ...-chrome_browser_chrome__browser__main__posix.cc |  22 ++
 ...ome_browser_chrome__content__browser__client.cc |  74 ++++
 ...rome_browser_chrome__content__browser__client.h |  11 +
 .../files/patch-chrome_browser_defaults.cc         |  11 +
 ...rome_browser_diagnostics_diagnostics__writer.cc |  11 +
 ...hrome_browser_diagnostics_diagnostics__writer.h |  11 +
 ...download_chrome__download__manager__delegate.cc |  20 ++
 ...h-chrome_browser_download_download__commands.cc |  38 ++
 ...ch-chrome_browser_download_download__commands.h |  12 +
 ...atch-chrome_browser_download_download__prefs.cc |  65 ++++
 ...patch-chrome_browser_download_download__prefs.h |  20 ++
 ...atch-chrome_browser_download_download__query.cc |  14 +
 ...wser_download_download__shelf__context__menu.cc |  11 +
 ...owser_extensions_activity__log_activity__log.cc |  14 +
 ..._writer__private_image__writer__private__api.cc |  15 +
 ...ser_extensions_api_input__ime_input__ime__api.h |  11 +
 ...er_extensions_api_messaging_message__service.cc |  20 ++
 ...pi_music__manager__private_device__id__linux.cc |  66 ++++
 ..._browser__context__keyed__service__factories.cc |  20 ++
 ..._browser_extensions_external__provider__impl.cc |  20 ++
 ...ome_browser_extensions_window__open__apitest.cc |  11 +
 ...patch-chrome_browser_gpu_gl__string__manager.cc |  11 +
 ...tch-chrome_browser_gpu_gpu__feature__checker.cc |  11 +
 ...ser_interstitials_chrome__controller__client.cc |  20 ++
 ..._galleries_fileapi_mtp__device__map__service.cc |  15 +
 ...dia__galleries_media__file__system__registry.cc |  14 +
 ...h-chrome_browser_media_webrtc__log__uploader.cc |  11 +
 .../files/patch-chrome_browser_memory__details.cc  |  20 ++
 ...chrome__browser__main__extra__parts__metrics.cc |  18 +
 ...tions_message__center__notification__manager.cc |  11 +
 ...d__manager_chrome__password__manager__client.cc |  14 +
 ...e_browser_plugins_plugins__resource__service.cc |  11 +
 ...me_browser_policy_policy__prefs__browsertest.cc |  11 +
 ...tch-chrome_browser_process__singleton__posix.cc |  34 ++
 ...h-chrome_browser_renderer__preferences__util.cc |  38 ++
 ..._incident__reporting_incident__handler__util.cc |  15 +
 ...ome_browser_search_local__files__ntp__source.cc |  16 +
 ...tch-chrome_browser_sync_chrome__sync__client.cc |  11 +
 ...ome_browser_tracing_crash__service__uploader.cc |  11 +
 ...rome_browser_ui_browser__command__controller.cc |  38 ++
 ...patch-chrome_browser_ui_browser__view__prefs.cc |  20 ++
 ..._exclusive__access_exclusive__access__bubble.cc |  11 +
 ...ui_input__method_input__method__engine__base.cc |  11 +
 ...atch-chrome_browser_ui_panels_panel__manager.cc |  11 +
 ...browser_ui_startup_startup__browser__creator.cc |  11 +
 ...h-chrome_browser_ui_toolbar_app__menu__model.cc |  11 +
 ...pps_chrome__native__app__window__views__aura.cc |  20 ++
 ...ome_browser_ui_views_chrome__views__delegate.cc |  29 ++
 ...rome_browser_ui_views_chrome__views__delegate.h |  20 ++
 ...h-chrome_browser_ui_views_first__run__dialog.cc |  20 ++
 ...chrome_browser_ui_views_frame_browser__frame.cc |  20 ++
 ...-chrome_browser_ui_views_frame_browser__view.cc |  20 ++
 ..._ui_views_frame_opaque__browser__frame__view.cc |  20 ++
 ...s_frame_opaque__browser__frame__view__layout.cc |  11 +
 ...ue__browser__frame__view__platform__specific.cc |  11 +
 ..._ui_views_frame_system__menu__model__builder.cc |  20 ++
 ...message__center_message__center__frame__view.cc |  11 +
 ...e_browser_ui_views_panels_panel__frame__view.cc |  11 +
 ..._browser_ui_views_tabs_tab__drag__controller.cc |  29 ++
 ...atch-chrome_browser_ui_views_tabs_tab__strip.cc |  11 +
 .../patch-chrome_browser_ui_webui_about__ui.cc     |  54 +++
 ...i_webui_chrome__web__ui__controller__factory.cc |  11 +
 ..._webui_extensions_extension__loader__handler.cc |  14 +
 ...r_ui_webui_options_browser__options__handler.cc |  45 +++
 ...er_ui_webui_options_browser__options__handler.h |  11 +
 ...ch-chrome_browser_web__applications_web__app.cc |  11 +
 ...tch-chrome_browser_web__applications_web__app.h |  11 +
 .../files/patch-chrome_chrome__browser.gypi        |  51 +++
 .../patch-chrome_chrome__browser__extensions.gypi  |  23 ++
 .../files/patch-chrome_chrome__browser__ui.gypi    |  20 ++
 .../files/patch-chrome_chrome__common.gypi         |  22 ++
 www/chromium/files/patch-chrome_chrome__exe.gypi   |  11 +
 .../files/patch-chrome_common_chrome__paths.cc     |  53 +++
 .../files/patch-chrome_common_chrome__paths.h      |  29 ++
 .../patch-chrome_common_chrome__paths__internal.h  |  11 +
 .../files/patch-chrome_common_chrome__switches.cc  |  11 +
 .../files/patch-chrome_common_chrome__switches.h   |  11 +
 ...me_common_component__flash__hint__file__linux.h |  14 +
 ...patch-chrome_common_extensions_api_schemas.gypi |  11 +
 .../patch-chrome_common_extensions_command.cc      |  11 +
 .../files/patch-chrome_common_pref__names.cc       |  20 ++
 .../files/patch-chrome_common_pref__names.h        |  20 ++
 ...mmon_variations_fieldtrial__testing__config.gyp |  11 +
 ...derer_pepper_pepper__flash__font__file__host.cc |  38 ++
 ...nderer_pepper_pepper__flash__font__file__host.h |  20 ++
 ...-chrome_test_base_in__process__browser__test.cc |  13 +
 ...ch-chrome_test_base_testing__browser__process.h |  13 +
 ...rome_test_chromedriver_chrome_chrome__finder.cc |  20 ++
 ...nt__renderer__password_form_conversion_utils.cc |  14 -
 ...nts__autofill__core__browser__form_structure.cc |  14 -
 ...components__cookie_config__cookie_store_util.cc |  24 --
 ...mponents__dom_distiller__core__page_features.cc |  14 -
 .../patch-components__drive__drive_api_util.cc     |  14 -
 .../patch-components__feedback__anonymizer_tool.cc |  14 -
 .../patch-components__flags_ui__flags_state.cc     |  11 -
 ...mponents__json_schema__json_schema_validator.cc |  14 -
 ...yed_service__core__dependency_graph_unittest.cc |  14 -
 ...nents__metrics__drive_metrics_provider_linux.cc |  16 -
 ..._metrics__system_memory_stats_recorder_linux.cc |  18 -
 ...d_manager__core__browser__import__csv_reader.cc |  14 -
 ...onents__plugins__renderer_plugin_placeholder.cc |  14 -
 ...tch-components__policy__core__common__schema.cc |  14 -
 ...nents__policy__resources__policy_templates.json |  29 --
 ...nents__policy__tools__generate_policy_source.py |  11 -
 .../files/patch-components__storage_monitor.gypi   |  29 --
 ...components__storage_monitor__storage_monitor.cc |  18 -
 ...ts__storage_monitor__storage_monitor_freebsd.cc | 104 ------
 ...nts__storage_monitor__storage_monitor_freebsd.h |  49 ---
 ...mponents__update_client__update_query_params.cc |  11 -
 ...h-components__url_matcher__regex_set_matcher.cc |  16 -
 ...components__url_matcher__url_matcher_factory.cc |  14 -
 ...ponents__webcrypto__algorithms__test_helpers.cc |  14 -
 ...t_renderer_password__form__conversion__utils.cc |  14 +
 ...onents_autofill_core_browser_form__structure.cc |  15 +
 ...omponents_cookie__config_cookie__store__util.cc |  24 ++
 ...omponents_dom__distiller_core_page__features.cc |  15 +
 .../patch-components_drive_drive__api__util.cc     |  14 +
 .../patch-components_feedback_anonymizer__tool.cc  |  14 +
 .../patch-components_flags__ui_flags__state.cc     |  11 +
 ...ponents_json__schema_json__schema__validator.cc |  14 +
 ...ed__service_core_dependency__graph__unittest.cc |  14 +
 ...ents_metrics_drive__metrics__provider__linux.cc |  16 +
 ...trics_system__memory__stats__recorder__linux.cc |  18 +
 ...patch-components_neterror_resources_neterror.js |  11 +
 ...ord__manager_core_browser_import_csv__reader.cc |  14 +
 ...ponents_plugins_renderer_plugin__placeholder.cc |  14 +
 .../patch-components_policy_core_common_schema.cc  |  14 +
 ...ponents_policy_resources_policy__templates.json |  29 ++
 ...onents_policy_tools_generate__policy__source.py |  11 +
 .../files/patch-components_storage__monitor.gypi   |  29 ++
 ...components_storage__monitor_storage__monitor.cc |  18 +
 ...s_storage__monitor_storage__monitor__freebsd.cc | 104 ++++++
 ...ts_storage__monitor_storage__monitor__freebsd.h |  49 +++
 ...ponents_update__client_update__query__params.cc |  11 +
 ...-components_url__matcher_regex__set__matcher.cc |  16 +
 ...omponents_url__matcher_url__matcher__factory.cc |  14 +
 ...omponents_webcrypto_algorithms_test__helpers.cc |  14 +
 .../patch-content__app__content_main_runner.cc     |  42 ---
 .../patch-content__browser__browser_main_loop.cc   |  20 --
 ...tch-content__browser__child_process_launcher.cc | 109 ------
 .../patch-content__browser__download__base_file.cc |  12 -
 ...-content__browser__download__base_file_linux.cc |  12 -
 ...owser__geolocation__location_arbitrator_impl.cc |  11 -
 ...ser__geolocation__wifi_data_provider_freebsd.cc | 204 -----------
 ...wser__geolocation__wifi_data_provider_freebsd.h |  33 --
 ..._browser__gpu__gpu_data_manager_impl_private.cc |  36 --
 ...rowser__indexed_db__indexed_db_backing_store.cc |  11 -
 ..._renderer_host__render_widget_host_view_aura.cc |  38 --
 ...r__renderer_host__renderer_process_host_impl.cc |  10 -
 .../patch-content__browser__time_zone_monitor.cc   |  11 -
 ...ch-content__browser__time_zone_monitor_linux.cc |  22 --
 ..._sandbox_linux__sandbox_debug_handling_linux.cc |  29 --
 ...tch-content__common__set_process_title_linux.cc |  19 -
 ...atch-content__common__set_process_title_linux.h |  20 --
 .../files/patch-content__content_browser.gypi      |  41 ---
 .../files/patch-content__content_common.gypi       |  24 --
 .../files/patch-content__content_tests.gypi        |  18 -
 .../files/patch-content__gpu__gpu_child_thread.cc  |  18 -
 www/chromium/files/patch-content__gpu__gpu_main.cc |  45 ---
 ...ch-content__public__common__content_switches.cc |  11 -
 ...tch-content__public__common__content_switches.h |  11 -
 ...tch-content__public__test__browser_test_base.cc |  13 -
 ...nt__renderer__devtools__v8_sampling_profiler.cc |  13 -
 ...tent__renderer__media__webrtc_audio_capturer.cc |  13 -
 .../patch-content__renderer__render_thread_impl.cc |  11 -
 ...tent__renderer__renderer_blink_platform_impl.cc |  65 ----
 ...ntent__renderer__renderer_blink_platform_impl.h |  11 -
 ...derer__renderer_main_platform_delegate_linux.cc |  19 -
 ...enderer__webscrollbarbehavior_impl_gtkoraura.cc |  20 --
 ...ntent__shell__browser__shell_browser_context.cc |  20 --
 ...nt__shell__browser__shell_browser_main_parts.cc |  20 --
 .../patch-content_app_content__main__runner.cc     |  42 +++
 ..._browser_accessibility_browser__accessibility.h |  20 ++
 ...accessibility_browser__accessibility__manager.h |  20 ++
 .../patch-content_browser_browser__main__loop.cc   |  20 ++
 ...tch-content_browser_child__process__launcher.cc |  38 ++
 .../patch-content_browser_download_base__file.cc   |  12 +
 ...h-content_browser_download_base__file__linux.cc |  12 +
 ...owser_geolocation_location__arbitrator__impl.cc |  11 +
 ...er_geolocation_wifi__data__provider__freebsd.cc | 204 +++++++++++
 ...ser_geolocation_wifi__data__provider__freebsd.h |  33 ++
 ...rowser_gpu_gpu__data__manager__impl__private.cc |  36 ++
 ...patch-content_browser_gpu_gpu__internals__ui.cc |  29 ++
 ...wser_indexed__db_indexed__db__backing__store.cc |  11 +
 ...content_browser_ppapi__plugin__process__host.cc |  29 ++
 ...r_renderer__host_render__process__host__impl.cc |  29 ++
 ...derer__host_render__widget__host__view__aura.cc |  38 ++
 .../patch-content_browser_time__zone__monitor.cc   |  11 +
 ...h-content_browser_time__zone__monitor__linux.cc |  22 ++
 ...content_browser_utility__process__host__impl.cc |  56 +++
 ...ndbox__linux_sandbox__debug__handling__linux.cc |  29 ++
 ...ch-content_common_set__process__title__linux.cc |  19 +
 ...tch-content_common_set__process__title__linux.h |  20 ++
 .../files/patch-content_content__browser.gypi      |  77 ++++
 .../files/patch-content_content__common.gypi       |  24 ++
 .../files/patch-content_content__tests.gypi        |  18 +
 .../files/patch-content_gpu_gpu__child__thread.cc  |  18 +
 www/chromium/files/patch-content_gpu_gpu__main.cc  |  45 +++
 ...atch-content_public_common_content__switches.cc |  11 +
 ...patch-content_public_common_content__switches.h |  11 +
 ...atch-content_public_test_browser__test__base.cc |  13 +
 ...ent_renderer_devtools_v8__sampling__profiler.cc |  13 +
 ...ntent_renderer_media_webrtc__audio__capturer.cc |  13 +
 .../patch-content_renderer_render__thread__impl.cc |  11 +
 ...ent_renderer_renderer__blink__platform__impl.cc |  56 +++
 ...tent_renderer_renderer__blink__platform__impl.h |  11 +
 ...er_renderer__main__platform__delegate__linux.cc |  19 +
 ...nderer_webscrollbarbehavior__impl__gtkoraura.cc |  20 ++
 ...ontent_shell_browser_shell__browser__context.cc |  20 ++
 ...nt_shell_browser_shell__browser__main__parts.cc |  20 ++
 www/chromium/files/patch-crypto__nss_util.cc       |  33 --
 www/chromium/files/patch-crypto_nss__util.cc       |  33 ++
 www/chromium/files/patch-device__hid__hid.gyp      |  21 --
 .../files/patch-device__serial__serial.gyp         |  15 -
 ...atch-device__serial__serial_io_handler_posix.cc |  11 -
 .../patch-device__serial__serial_service_impl.cc   |  17 -
 www/chromium/files/patch-device__usb__usb.gyp      |  14 -
 .../files/patch-device__usb__usb_context.cc        |  26 --
 .../patch-device__usb__usb_context_unittest.cc     |  14 -
 .../patch-device__usb__usb_device_handle_impl.cc   |  15 -
 .../patch-device__usb__usb_device_handle_impl.h    |  15 -
 .../files/patch-device__usb__usb_device_impl.cc    |  14 -
 www/chromium/files/patch-device__usb__usb_error.cc |  14 -
 .../files/patch-device__usb__usb_service_impl.cc   |  59 ---
 .../files/patch-device__usb__usb_service_impl.h    |  40 ---
 www/chromium/files/patch-device_hid_hid.gyp        |  21 ++
 www/chromium/files/patch-device_serial_serial.gyp  |  15 +
 ...tch-device_serial_serial__io__handler__posix.cc |  11 +
 .../patch-device_serial_serial__service__impl.cc   |  17 +
 www/chromium/files/patch-device_usb_usb.gyp        |  19 +
 .../files/patch-device_usb_usb__context.cc         |  26 ++
 .../patch-device_usb_usb__context__unittest.cc     |  14 +
 .../patch-device_usb_usb__device__handle__impl.cc  |  15 +
 .../patch-device_usb_usb__device__handle__impl.h   |  15 +
 .../files/patch-device_usb_usb__device__impl.cc    |  14 +
 www/chromium/files/patch-device_usb_usb__error.cc  |  14 +
 .../files/patch-device_usb_usb__service__impl.cc   |  60 ++++
 .../files/patch-device_usb_usb__service__impl.h    |  40 +++
 ...i__declarative_webrequest__webrequest_action.cc |  14 -
 ...extensions__browser__api__serial__serial_api.cc |  12 -
 ..._browser__api__web_request__form_data_parser.cc |  14 -
 .../files/patch-extensions__common__image_util.cc  |  14 -
 .../files/patch-extensions__common__stack_frame.cc |  14 -
 ...i_declarative__webrequest_webrequest__action.cc |  14 +
 ...ch-extensions_browser_api_serial_serial__api.cc |  16 +
 ..._browser_api_web__request_form__data__parser.cc |  14 +
 .../files/patch-extensions_common_image__util.cc   |  14 +
 .../files/patch-extensions_common_stack__frame.cc  |  14 +
 ...pu__command_buffer__service__program_manager.cc |  14 -
 .../files/patch-gpu__config__gpu_control_list.cc   |  14 -
 ...patch-gpu__config__gpu_control_list_unittest.cc |  12 -
 .../files/patch-gpu__config__gpu_info_collector.cc |  13 -
 .../files/patch-gpu__config__gpu_test_config.cc    |  30 --
 www/chromium/files/patch-gpu__config__gpu_util.cc  |  15 -
 www/chromium/files/patch-gpu__gpu_config.gypi      |  23 --
 ...gpu_command__buffer_service_program__manager.cc |  14 +
 .../files/patch-gpu_config_gpu__control__list.cc   |  14 +
 ...atch-gpu_config_gpu__control__list__unittest.cc |  12 +
 .../files/patch-gpu_config_gpu__info__collector.cc |  13 +
 .../files/patch-gpu_config_gpu__test__config.cc    |  30 ++
 www/chromium/files/patch-gpu_gpu__config.gypi      |  23 ++
 .../files/patch-gpu_gpu__ipc__service.gypi         |  11 +
 .../files/patch-ipc_ipc__message__utils.cc         |  11 +
 www/chromium/files/patch-ipc_ipc__message__utils.h |  11 +
 ...patch-media__audio__alsa__audio_manager_alsa.cc |  54 ---
 .../files/patch-media__audio__audio_manager.cc     |  29 --
 .../files/patch-media__audio__audio_manager.h      |  11 -
 .../files/patch-media__base__audio_splicer.cc      |  20 --
 ...re__video__fake_video_capture_device_factory.cc |  11 -
 ...re__video__file_video_capture_device_factory.cc |  11 -
 ...re__video__linux__video_capture_device_linux.cc |  62 ----
 ...-media__capture__video__video_capture_device.cc |  31 --
 ...h-media__capture__video__video_capture_device.h |  38 --
 ...capture__video__video_capture_device_factory.cc |  21 --
 ...tch-media__filters__decrypting_audio_decoder.cc |  11 -
 .../files/patch-media__filters__vp9_parser.h       |  10 -
 ...ch-media__formats__common__offset_byte_queue.cc |  20 --
 ...tch-media__formats__common__offset_byte_queue.h |  22 --
 .../patch-media__formats__mp2t__es_parser_adts.cc  |  26 --
 ...h-media__formats__mp2t__es_parser_mpeg1audio.cc |  26 --
 www/chromium/files/patch-media__media.gyp          |  33 --
 .../files/patch-media_audio_audio__manager.cc      |  29 ++
 .../files/patch-media_audio_audio__manager.h       |  11 +
 .../files/patch-media_base_audio__splicer.cc       |  20 ++
 ..._video_fake__video__capture__device__factory.cc |  11 +
 ..._video_file__video__capture__device__factory.cc |  11 +
 ...re_video_linux_video__capture__device__linux.cc |  62 ++++
 ...h-media_capture_video_video__capture__device.cc |  31 ++
 ...ch-media_capture_video_video__capture__device.h |  38 ++
 ...apture_video_video__capture__device__factory.cc |  21 ++
 ...tch-media_filters_decrypting__audio__decoder.cc |  11 +
 .../files/patch-media_filters_vp9__parser.h        |  10 +
 ...tch-media_formats_common_offset__byte__queue.cc |  20 ++
 ...atch-media_formats_common_offset__byte__queue.h |  22 ++
 .../patch-media_formats_mp2t_es__parser__adts.cc   |  26 ++
 ...ch-media_formats_mp2t_es__parser__mpeg1audio.cc |  26 ++
 www/chromium/files/patch-media_media.gyp           |  26 ++
 ..._shell_public_cpp_initialize__base__and__icu.cc |  16 +
 www/chromium/files/patch-mojo_shell_runner_init.cc |  19 +
 .../files/patch-native__client_build_common.gypi   |  11 +
 ...native__client_src_shared_platform_platform.gyp |  11 +
 .../files/patch-native_client__build__common.gypi  |  11 -
 ...ive_client__src__shared__platform__platform.gyp |  11 -
 .../patch-net__base__address_tracker_linux.cc      |  94 -----
 .../files/patch-net__base__address_tracker_linux.h |  27 --
 ...ch-net__base__address_tracker_linux_unittest.cc |  14 -
 .../files/patch-net__base__mime_util_unittest.cc   |  11 -
 .../patch-net__base__network_change_notifier.cc    |  10 -
 .../patch-net__base__network_interfaces_linux.cc   | 105 ------
 .../patch-net__base__network_interfaces_posix.cc   |  18 -
 .../files/patch-net__dns__address_sorter_posix.cc  |  10 -
 ...-net__dns__dns_config_service_posix_unittest.cc |  11 -
 www/chromium/files/patch-net__dns__dns_reloader.cc |  13 -
 www/chromium/files/patch-net__dns__dns_session.cc  |  11 -
 .../patch-net__http__http_auth_gssapi_posix.cc     |  13 -
 www/chromium/files/patch-net__net.gyp              |  23 --
 www/chromium/files/patch-net__net.gypi             |  22 --
 www/chromium/files/patch-net__net_common.gypi      |  14 -
 ...patch-net__proxy__proxy_config_service_linux.cc | 145 --------
 .../files/patch-net__proxy__proxy_service.cc       |  20 --
 ...tch-net__quic__congestion_control__rtt_stats.cc |  29 --
 .../patch-net__socket__socks5_client_socket.cc     |  13 -
 .../files/patch-net__udp__udp_socket_unittest.cc   |  11 -
 .../patch-net_base_address__tracker__linux.cc      |  94 +++++
 .../files/patch-net_base_address__tracker__linux.h |  28 ++
 ...h-net_base_address__tracker__linux__unittest.cc |  14 +
 .../files/patch-net_base_mime__util__unittest.cc   |  11 +
 .../patch-net_base_network__change__notifier.cc    |  10 +
 .../patch-net_base_network__interfaces__linux.cc   | 105 ++++++
 .../patch-net_base_network__interfaces__posix.cc   |  18 +
 .../files/patch-net_dns_address__sorter__posix.cc  |  10 +
 ...et_dns_dns__config__service__posix__unittest.cc |  11 +
 www/chromium/files/patch-net_dns_dns__reloader.cc  |  13 +
 www/chromium/files/patch-net_dns_dns__session.cc   |  11 +
 .../patch-net_http_http__auth__gssapi__posix.cc    |  13 +
 www/chromium/files/patch-net_net.gyp               |  23 ++
 www/chromium/files/patch-net_net.gypi              |  22 ++
 www/chromium/files/patch-net_net__common.gypi      |  14 +
 ...atch-net_proxy_proxy__config__service__linux.cc | 145 ++++++++
 .../files/patch-net_proxy_proxy__service.cc        |  20 ++
 ...atch-net_quic_congestion__control_rtt__stats.cc |  29 ++
 .../patch-net_socket_socks5__client__socket.cc     |  13 +
 .../files/patch-net_udp_udp__socket__unittest.cc   |  11 +
 .../files/patch-pdf_pdfium_pdfium__engine.cc       |  56 +++
 .../files/patch-ppapi__proxy__file_io_resource.cc  |  48 ---
 ...ared_impl__private__net_address_private_impl.cc |  16 -
 .../files/patch-ppapi_proxy_file__io__resource.cc  |  48 +++
 ...ed__impl_private_net__address__private__impl.cc |  16 +
 www/chromium/files/patch-printing__printing.gyp    |  11 -
 www/chromium/files/patch-printing_printing.gyp     |  11 +
 .../files/patch-remoting__remoting_host.gypi       |  54 ---
 .../files/patch-remoting_remoting__host.gypi       |  29 ++
 .../patch-skia__ext__SkMemory_new_handler.cpp      |  20 --
 www/chromium/files/patch-skia__skia_chrome.gypi    |  14 -
 www/chromium/files/patch-skia__skia_common.gypi    |  11 -
 .../patch-skia_ext_SkMemory__new__handler.cpp      |  20 ++
 www/chromium/files/patch-skia_skia__chrome.gypi    |  14 +
 www/chromium/files/patch-skia_skia__common.gypi    |  11 +
 .../files/patch-sync__util__get_session_name.cc    |  20 --
 .../patch-sync__util__get_session_name_linux.cc    |  14 -
 .../files/patch-sync_util_get__session__name.cc    |  20 ++
 .../patch-sync_util_get__session__name__linux.cc   |  14 +
 .../files/patch-testing__gtest__src__gtest.cc      |  22 --
 .../files/patch-testing_gtest_src_gtest.cc         |  22 ++
 ...bKit_Source_bindings_core_v8_V8ScriptRunner.cpp |  11 +
 .../patch-third__party_WebKit_Source_core_core.gyp |  20 ++
 ...arty_WebKit_Source_platform_blink__platform.gyp |  42 +++
 ...arty_WebKit_Source_platform_fonts_FontCache.cpp |  18 +
 ..._party_WebKit_Source_platform_fonts_FontCache.h |  11 +
 ...it_Source_platform_fonts_skia_FontCacheSkia.cpp |  29 ++
 ...d__party_WebKit_Source_platform_heap_GCInfo.cpp |  11 +
 ...WebKit_Source_platform_heap_StackFrameDepth.cpp |  11 +
 ...platform_image-decoders_png_PNGImageDecoder.cpp |  11 +
 ...party_WebKit_Source_platform_text_Character.cpp |  22 ++
 ...latform_text_CharacterPropertyDataGenerator.cpp |  17 +
 .../patch-third__party_WebKit_Source_web_web.gyp   |  11 +
 ...patch-third__party_WebKit_Source_wtf_ByteSwap.h |  18 +
 .../patch-third__party_WebKit_Source_wtf_wtf.gyp   |  11 +
 ...st_cpp_src_phonenumbers_base_memory_singleton.h |  11 +
 ...pp_src_phonenumbers_base_synchronization_lock.h |  11 +
 ...on_src_google_cacheinvalidation_include_types.h |  11 +
 ..._party_ffmpeg_chromium_scripts_generate__gyp.py |  20 ++
 ...patch-third__party_ffmpeg_ffmpeg__generated.gni | 319 +++++++++++++++++
 ...atch-third__party_ffmpeg_ffmpeg__generated.gypi | 395 +++++++++++++++++++++
 .../patch-third__party_ffmpeg_libavutil_mem.c      |  11 +
 .../files/patch-third__party_flac_flac.gyp         | 116 ++++++
 .../files/patch-third__party_jsoncpp_jsoncpp.gyp   |  54 +++
 .../files/patch-third__party_khronos_khronos.gyp   |  10 +
 ...tch-third__party_leveldatabase_env__chromium.cc |  14 +
 .../patch-third__party_libXNVCtrl_libXNVCtrl.gyp   |  12 +
 .../patch-third__party_libjingle_libjingle.gyp     |  20 ++
 .../files/patch-third__party_libjpeg_libjpeg.gyp   | 133 +++++++
 ...ist_cpp_src_phonenumbers_base_thread__checker.h |  19 +
 ...-third__party_libphonenumber_libphonenumber.gyp |  10 +
 .../files/patch-third__party_libusb_libusb.gyp     | 157 ++++++++
 .../files/patch-third__party_libwebp_libwebp.gyp   | 311 ++++++++++++++++
 .../files/patch-third__party_libxml_libxml.gyp     | 309 ++++++++++++++++
 .../files/patch-third__party_libxslt_libxslt.gyp   | 150 ++++++++
 .../patch-third__party_libyuv_include_libyuv_row.h |  11 +
 ...h-third__party_ots_include_opentype-sanitiser.h |  10 +
 ...patch-third__party_pdfium_build_standalone.gypi |  29 ++
 ...d__party_pdfium_core_fxcrt_include_fx__system.h |  11 +
 ...__party_pdfium_fpdfsdk_javascript_JS__Value.cpp |  28 ++
 ...rty_pdfium_fpdfsdk_javascript_PublicMethods.cpp | 106 ++++++
 .../files/patch-third__party_pdfium_pdfium.gyp     |  11 +
 ...third__party_pdfium_third__party_base_logging.h |  11 +
 www/chromium/files/patch-third__party_re2_re2.gyp  | 112 ++++++
 .../files/patch-third__party_sfntly_sfntly.gyp     |  10 +
 .../files/patch-third__party_snappy_snappy.gyp     | 121 +++++++
 .../files/patch-third__party_sqlite_sqlite.gyp     |  11 +
 .../files/patch-third__party_usrsctp_usrsctp.gyp   |  17 +
 .../patch-third__party_webrtc_base_httpcommon.cc   |  11 +
 ...h-third__party_webrtc_base_ifaddrs__converter.h |  11 +
 .../patch-third__party_webrtc_base_ipaddress.h     |  13 +
 .../files/patch-third__party_webrtc_base_linux.cc  |  17 +
 .../files/patch-third__party_webrtc_base_linux.h   |  18 +
 .../patch-third__party_webrtc_base_network.cc      |  29 ++
 .../files/patch-third__party_webrtc_base_network.h |  13 +
 ...hird__party_webrtc_base_physicalsocketserver.cc |  33 ++
 ...ch-third__party_webrtc_base_platform__thread.cc |  42 +++
 .../patch-third__party_webrtc_base_stringutils.h   |  17 +
 .../patch-third__party_webrtc_base_systeminfo.cc   |  40 +++
 .../patch-third__party_webrtc_build_common.gypi    |  25 ++
 ...webrtc_modules_audio__device_audio__device.gypi |  20 ++
 ..._modules_desktop__capture_desktop__capture.gypi |  14 +
 ..._rtp__rtcp_source_forward__error__correction.cc |  10 +
 ..._party_webrtc_modules_video__coding_receiver.cc |  13 +
 ...brtc_system__wrappers_source_atomic32__posix.cc |  14 +
 ...y_webrtc_voice__engine_voice__engine__defines.h |  11 +
 ..._Source__bindings__core__v8__V8ScriptRunner.cpp |  11 -
 ...tch-third_party__WebKit__Source__core__core.gyp |  45 ---
 ...y__WebKit__Source__platform__blink_platform.gyp |  48 ---
 ...rty__WebKit__Source__platform__heap__GCInfo.cpp |  11 -
 ...it__Source__platform__heap__StackFrameDepth.cpp |  11 -
 ...patch-third_party__WebKit__Source__web__web.gyp |  11 -
 ...ch-third_party__WebKit__Source__wtf__ByteSwap.h |  18 -
 ...patch-third_party__WebKit__Source__wtf__wtf.gyp |  11 -
 ...rty__ffmpeg__chromium__scripts__generate_gyp.py |  20 --
 ...patch-third_party__ffmpeg__ffmpeg_generated.gni | 319 -----------------
 ...atch-third_party__ffmpeg__ffmpeg_generated.gypi | 395 ---------------------
 .../patch-third_party__ffmpeg__libavutil__mem.c    |  11 -
 .../files/patch-third_party__khronos__khronos.gyp  |  10 -
 ...tch-third_party__leveldatabase__env_chromium.cc |  14 -
 .../patch-third_party__libXNVCtrl__libXNVCtrl.gyp  |  12 -
 .../files/patch-third_party__libexif__libexif.gyp  |  14 -
 .../patch-third_party__libjingle__libjingle.gyp    |  11 -
 .../patch-third_party__libjpeg_turbo__libjpeg.gyp  |  11 -
 ...third_party__libphonenumber__libphonenumber.gyp |  10 -
 ...tch-third_party__libyuv__include__libyuv__row.h |  11 -
 ...third_party__ots__include__opentype-sanitiser.h |  10 -
 ...tch-third_party__pdfium__build__standalone.gypi |  27 --
 ...arty__pdfium__core__include__fxcrt__fx_system.h |  11 -
 ..._pdfium__fpdfsdk__src__javascript__JS_Value.cpp |  28 --
 ...um__fpdfsdk__src__javascript__PublicMethods.cpp |  20 --
 .../files/patch-third_party__pdfium__pdfium.gyp    |  11 -
 ...ird_party__pdfium__third_party__base__logging.h |  11 -
 .../files/patch-third_party__sfntly__sfntly.gyp    |  10 -
 .../files/patch-third_party__sqlite__sqlite.gyp    |  11 -
 .../patch-third_party__webrtc__base__httpcommon.cc |  11 -
 ...-third_party__webrtc__base__ifaddrs_converter.h |  11 -
 .../patch-third_party__webrtc__base__ipaddress.h   |  13 -
 .../patch-third_party__webrtc__base__linux.cc      |  17 -
 .../files/patch-third_party__webrtc__base__linux.h |  18 -
 .../patch-third_party__webrtc__base__network.cc    |  29 --
 .../patch-third_party__webrtc__base__network.h     |  13 -
 ...rd_party__webrtc__base__physicalsocketserver.cc |  33 --
 ...h-third_party__webrtc__base__platform_thread.cc |  42 ---
 .../patch-third_party__webrtc__base__stringutils.h |  17 -
 .../patch-third_party__webrtc__base__systeminfo.cc |  40 ---
 .../patch-third_party__webrtc__build__common.gypi  |  16 -
 ...ebrtc__modules__audio_device__audio_device.gypi |  20 --
 ..._modules__desktop_capture__desktop_capture.gypi |  14 -
 ...__rtp_rtcp__source__forward_error_correction.cc |  10 -
 ...rty__webrtc__modules__video_coding__receiver.cc |  13 -
 ...rtc__system_wrappers__source__atomic32_posix.cc |  14 -
 ...y__webrtc__voice_engine__voice_engine_defines.h |  11 -
 ...atch-tools__gyp__pylib__gyp__generator__make.py |  41 ---
 ...est__additional-targets__src__dir1__actions.gyp |  11 -
 ...tch-tools__gyp__test__library__src__library.gyp |  11 -
 .../patch-tools_gyp_pylib_gyp_generator_make.py    |  41 +++
 ...yp_test_additional-targets_src_dir1_actions.gyp |  11 +
 .../patch-tools_gyp_test_library_src_library.gyp   |  11 +
 .../patch-ui__accessibility__accessibility.gyp     |  20 --
 ...ui__accessibility__platform__ax_platform_node.h |  11 -
 .../patch-ui__app_list__app_list_constants.cc      |  11 -
 .../files/patch-ui__app_list__app_list_constants.h |  13 -
 .../files/patch-ui__app_list__app_list_menu.cc     |  11 -
 .../patch-ui__app_list__views__app_list_view.cc    |  20 --
 .../patch-ui__base__ime__input_method_factory.cc   |  20 --
 ...atch-ui__base__ime__input_method_initializer.cc |  28 --
 .../patch-ui__base__resource__resource_bundle.cc   |  11 -
 www/chromium/files/patch-ui__base__ui_base.gyp     |  11 -
 ..._base__user_activity__user_activity_detector.cc |  20 --
 www/chromium/files/patch-ui__base__web_ui_util.cc  |  11 -
 .../files/patch-ui__events__event_switches.cc      |  11 -
 .../files/patch-ui__events__event_switches.h       |  11 -
 ...ui__events__keycodes__dom__keycode_converter.cc |  11 -
 www/chromium/files/patch-ui__gfx__canvas_skia.cc   |  11 -
 www/chromium/files/patch-ui__gfx__render_text.cc   |  46 ---
 www/chromium/files/patch-ui__gl__gl.gyp            |  20 --
 www/chromium/files/patch-ui__gl__gl_surface_glx.cc |  11 -
 .../patch-ui__gl__sync_control_vsync_provider.cc   |  29 --
 ...atch-ui__message_center__message_center_style.h |  11 -
 ...age_center__views__message_center_button_bar.cc |  47 ---
 ...sage_center__views__message_center_button_bar.h |  11 -
 ...__message_center__views__message_center_view.cc |  20 --
 ...ui__message_center__views__notification_view.cc |  11 -
 .../files/patch-ui__resources__ui_resources.grd    |  11 -
 .../patch-ui__shell_dialogs__select_file_dialog.cc |  20 --
 ...ews__accessibility__native_view_accessibility.h |  11 -
 .../patch-ui__views__bubble__bubble_delegate.cc    |  11 -
 ...ch-ui__views__controls__button__label_button.cc |  20 --
 ..._views__controls__scrollbar__base_scroll_bar.cc |  11 -
 ...ch-ui__views__controls__textfield__textfield.cc |  83 -----
 ...patch-ui__views__controls__webview__webview.gyp |  11 -
 .../patch-ui__views__examples__widget_example.cc   |  12 -
 www/chromium/files/patch-ui__views__views.gyp      |  20 --
 .../files/patch-ui__views__views_delegate.cc       |  11 -
 .../files/patch-ui__views__views_delegate.h        |  11 -
 .../files/patch-ui__views__views_switches.cc       |  11 -
 .../patch-ui__views__window__custom_frame_view.cc  |  11 -
 .../patch-ui__views__window__dialog_delegate.cc    |  11 -
 .../files/patch-ui__webui__resources__js__cr.js    |  13 -
 .../files/patch-ui__webui__resources__js__util.js  |  11 -
 .../files/patch-ui_accessibility_accessibility.gyp |  20 ++
 ...-ui_accessibility_platform_ax__platform__node.h |  11 +
 .../patch-ui_app__list_app__list__constants.cc     |  11 +
 .../patch-ui_app__list_app__list__constants.h      |  13 +
 .../files/patch-ui_app__list_app__list__menu.cc    |  11 +
 .../patch-ui_app__list_views_app__list__view.cc    |  20 ++
 ...h-ui_base_ime_ime__engine__handler__interface.h |  11 +
 .../patch-ui_base_ime_input__method__factory.cc    |  20 ++
 ...patch-ui_base_ime_input__method__initializer.cc |  37 ++
 .../patch-ui_base_resource_resource__bundle.cc     |  20 ++
 www/chromium/files/patch-ui_base_ui__base.gyp      |  29 ++
 .../files/patch-ui_base_webui_web__ui__util.cc     |  11 +
 .../files/patch-ui_events_event__switches.cc       |  11 +
 .../files/patch-ui_events_event__switches.h        |  11 +
 ...ch-ui_events_keycodes_dom_keycode__converter.cc |  11 +
 www/chromium/files/patch-ui_gfx_canvas__skia.cc    |  11 +
 .../files/patch-ui_gfx_font__fallback__linux.cc    |  13 +
 .../files/patch-ui_gfx_font__render__params.h      |  18 +
 www/chromium/files/patch-ui_gfx_render__text.cc    |  46 +++
 www/chromium/files/patch-ui_gl_gl.gyp              |  20 ++
 www/chromium/files/patch-ui_gl_gl__surface__glx.cc |  11 +
 .../patch-ui_gl_sync__control__vsync__provider.cc  |  29 ++
 ...tch-ui_message__center_message__center__style.h |  11 +
 ...e__center_views_message__center__button__bar.cc |  47 +++
 ...ge__center_views_message__center__button__bar.h |  11 +
 ..._message__center_views_message__center__view.cc |  20 ++
 ...-ui_message__center_views_notification__view.cc |  11 +
 .../files/patch-ui_resources_ui__resources.grd     |  11 +
 ...ews_accessibility_native__view__accessibility.h |  11 +
 .../patch-ui_views_bubble_bubble__delegate.cc      |  11 +
 ...patch-ui_views_controls_button_label__button.cc |  20 ++
 ...i_views_controls_scrollbar_base__scroll__bar.cc |  11 +
 .../patch-ui_views_controls_textfield_textfield.cc |  83 +++++
 .../patch-ui_views_controls_webview_webview.gyp    |  11 +
 .../patch-ui_views_examples_widget__example.cc     |  11 +
 .../files/patch-ui_views_style_platform__style.cc  |  11 +
 www/chromium/files/patch-ui_views_views.gyp        |  26 ++
 .../files/patch-ui_views_views__delegate.cc        |  11 +
 .../files/patch-ui_views_views__delegate.h         |  11 +
 .../files/patch-ui_views_views__switches.cc        |  11 +
 .../patch-ui_views_window_custom__frame__view.cc   |  11 +
 .../patch-ui_views_window_dialog__delegate.cc      |  11 +
 .../files/patch-ui_webui_resources_js_cr.js        |  14 +
 .../files/patch-ui_webui_resources_js_util.js      |  11 +
 ...atch-v8__src__base__platform__platform-posix.cc |  30 --
 .../patch-v8_src_base_platform_platform-posix.cc   |  30 ++
 www/chromium/pkg-plist                             |  12 +-
 736 files changed, 10477 insertions(+), 8231 deletions(-)
 delete mode 100644 www/chromium/files/patch-base__base.gyp
 delete mode 100644 www/chromium/files/patch-base__base.gypi
 delete mode 100644 www/chromium/files/patch-base__debug__stack_trace_posix.cc
 delete mode 100644 www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
 delete mode 100644 www/chromium/files/patch-base__move.h
 delete mode 100644 www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
 delete mode 100644 www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
 delete mode 100644 www/chromium/files/patch-base__process__internal_linux.h
 delete mode 100644 www/chromium/files/patch-base__process__launch.cc
 delete mode 100644 www/chromium/files/patch-base__process__launch.h
 delete mode 100644 www/chromium/files/patch-base__process__memory.cc
 delete mode 100644 www/chromium/files/patch-base__process__memory_stubs.cc
 delete mode 100644 www/chromium/files/patch-base__process__memory_unittest.cc
 delete mode 100644 www/chromium/files/patch-base__process__process_info_linux.cc
 delete mode 100644 www/chromium/files/patch-base__process__process_iterator_freebsd.cc
 delete mode 100644 www/chromium/files/patch-base__process__process_metrics.h
 delete mode 100644 www/chromium/files/patch-base__process__process_metrics_freebsd.cc
 delete mode 100644 www/chromium/files/patch-base__process__process_posix.cc
 delete mode 100644 www/chromium/files/patch-base__security_unittest.cc
 delete mode 100644 www/chromium/files/patch-base__strings__safe_sprintf.cc
 delete mode 100644 www/chromium/files/patch-base__sys_info_freebsd.cc
 delete mode 100644 www/chromium/files/patch-base__sys_info_posix.cc
 delete mode 100644 www/chromium/files/patch-base__test__launcher__test_launcher.cc
 delete mode 100644 www/chromium/files/patch-base__threading__platform_thread_linux.cc
 delete mode 100644 www/chromium/files/patch-base__trace_event__process_memory_dump.cc
 create mode 100644 www/chromium/files/patch-base__trace_event__process_memory_dump.h
 create mode 100644 www/chromium/files/patch-base_base.gyp
 create mode 100644 www/chromium/files/patch-base_base.gypi
 create mode 100644 www/chromium/files/patch-base_debug_stack__trace__posix.cc
 create mode 100644 www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
 create mode 100644 www/chromium/files/patch-base_i18n_icu__util.cc
 create mode 100644 www/chromium/files/patch-base_i18n_icu__util.h
 create mode 100644 www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc
 create mode 100644 www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc
 create mode 100644 www/chromium/files/patch-base_process_internal__linux.h
 create mode 100644 www/chromium/files/patch-base_process_launch.cc
 create mode 100644 www/chromium/files/patch-base_process_launch.h
 create mode 100644 www/chromium/files/patch-base_process_memory.cc
 create mode 100644 www/chromium/files/patch-base_process_memory__stubs.cc
 create mode 100644 www/chromium/files/patch-base_process_memory__unittest.cc
 create mode 100644 www/chromium/files/patch-base_process_process__info__linux.cc
 create mode 100644 www/chromium/files/patch-base_process_process__iterator__freebsd.cc
 create mode 100644 www/chromium/files/patch-base_process_process__metrics.h
 create mode 100644 www/chromium/files/patch-base_process_process__metrics__freebsd.cc
 create mode 100644 www/chromium/files/patch-base_process_process__posix.cc
 create mode 100644 www/chromium/files/patch-base_security__unittest.cc
 create mode 100644 www/chromium/files/patch-base_strings_safe__sprintf.cc
 create mode 100644 www/chromium/files/patch-base_sys__info__freebsd.cc
 create mode 100644 www/chromium/files/patch-base_sys__info__posix.cc
 create mode 100644 www/chromium/files/patch-base_test_launcher_test__launcher.cc
 create mode 100644 www/chromium/files/patch-base_third__party_libevent_libevent.gyp
 create mode 100644 www/chromium/files/patch-base_threading_platform__thread__linux.cc
 create mode 100644 www/chromium/files/patch-base_threading_platform__thread__posix.cc
 create mode 100644 www/chromium/files/patch-base_trace__event_process__memory__dump.cc
 delete mode 100644 www/chromium/files/patch-build__common.gypi
 delete mode 100644 www/chromium/files/patch-build__filename_rules.gypi
 delete mode 100644 www/chromium/files/patch-build__linux__system.gyp
 delete mode 100644 www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
 create mode 100644 www/chromium/files/patch-build_common.gypi
 create mode 100644 www/chromium/files/patch-build_filename__rules.gypi
 create mode 100644 www/chromium/files/patch-build_linux_system.gyp
 create mode 100644 www/chromium/files/patch-build_linux_unbundle_libwebp.gyp
 delete mode 100644 www/chromium/files/patch-cc__layers__layer_impl.cc
 delete mode 100644 www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc
 create mode 100644 www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
 create mode 100644 www/chromium/files/patch-cc_trees_property__tree.cc
 delete mode 100644 www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
 delete mode 100644 www/chromium/files/patch-chrome__app__chrome_main_delegate.h
 delete mode 100644 www/chromium/files/patch-chrome__app__chromium_strings.grd
 delete mode 100644 www/chromium/files/patch-chrome__app__resources__locale_settings.grd
 delete mode 100644 www/chromium/files/patch-chrome__browser__browser_resources.grd
 delete mode 100644 www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__defaults.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__download__download_commands.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__download__download_commands.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__download__download_prefs.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__download__download_prefs.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__download__download_query.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__memory_details.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__process_singleton_posix.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
 delete mode 100644 www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
 delete mode 100644 www/chromium/files/patch-chrome__browser__web_applications__web_app.h
 delete mode 100644 www/chromium/files/patch-chrome__chrome_browser.gypi
 delete mode 100644 www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
 delete mode 100644 www/chromium/files/patch-chrome__chrome_browser_ui.gypi
 delete mode 100644 www/chromium/files/patch-chrome__chrome_common.gypi
 delete mode 100644 www/chromium/files/patch-chrome__chrome_exe.gypi
 delete mode 100644 www/chromium/files/patch-chrome__common__chrome_paths.cc
 delete mode 100644 www/chromium/files/patch-chrome__common__chrome_paths.h
 delete mode 100644 www/chromium/files/patch-chrome__common__chrome_paths_internal.h
 delete mode 100644 www/chromium/files/patch-chrome__common__chrome_switches.cc
 delete mode 100644 www/chromium/files/patch-chrome__common__chrome_switches.h
 delete mode 100644 www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
 delete mode 100644 www/chromium/files/patch-chrome__common__extensions__command.cc
 delete mode 100644 www/chromium/files/patch-chrome__common__pref_names.cc
 delete mode 100644 www/chromium/files/patch-chrome__common__pref_names.h
 delete mode 100644 www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
 delete mode 100644 www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
 delete mode 100644 www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h
 delete mode 100644 www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
 delete mode 100644 www/chromium/files/patch-chrome__test__base__testing_browser_process.h
 delete mode 100644 www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
 create mode 100644 www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
 create mode 100644 www/chromium/files/patch-chrome_app_chrome__main__delegate.h
 create mode 100644 www/chromium/files/patch-chrome_app_chromium__strings.grd
 create mode 100644 www/chromium/files/patch-chrome_app_generated__resources.grd
 create mode 100644 www/chromium/files/patch-chrome_app_resources_locale__settings.grd
 create mode 100644 www/chromium/files/patch-chrome_browser_about__flags.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_browser__resources.grd
 create mode 100644 www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
 create mode 100644 www/chromium/files/patch-chrome_browser_defaults.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
 create mode 100644 www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_download_download__commands.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_download_download__commands.h
 create mode 100644 www/chromium/files/patch-chrome_browser_download_download__prefs.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_download_download__prefs.h
 create mode 100644 www/chromium/files/patch-chrome_browser_download_download__query.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_memory__details.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
 create mode 100644 www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
 create mode 100644 www/chromium/files/patch-chrome_browser_web__applications_web__app.h
 create mode 100644 www/chromium/files/patch-chrome_chrome__browser.gypi
 create mode 100644 www/chromium/files/patch-chrome_chrome__browser__extensions.gypi
 create mode 100644 www/chromium/files/patch-chrome_chrome__browser__ui.gypi
 create mode 100644 www/chromium/files/patch-chrome_chrome__common.gypi
 create mode 100644 www/chromium/files/patch-chrome_chrome__exe.gypi
 create mode 100644 www/chromium/files/patch-chrome_common_chrome__paths.cc
 create mode 100644 www/chromium/files/patch-chrome_common_chrome__paths.h
 create mode 100644 www/chromium/files/patch-chrome_common_chrome__paths__internal.h
 create mode 100644 www/chromium/files/patch-chrome_common_chrome__switches.cc
 create mode 100644 www/chromium/files/patch-chrome_common_chrome__switches.h
 create mode 100644 www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h
 create mode 100644 www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi
 create mode 100644 www/chromium/files/patch-chrome_common_extensions_command.cc
 create mode 100644 www/chromium/files/patch-chrome_common_pref__names.cc
 create mode 100644 www/chromium/files/patch-chrome_common_pref__names.h
 create mode 100644 www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp
 create mode 100644 www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
 create mode 100644 www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
 create mode 100644 www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
 create mode 100644 www/chromium/files/patch-chrome_test_base_testing__browser__process.h
 create mode 100644 www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
 delete mode 100644 www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc
 delete mode 100644 www/chromium/files/patch-components__autofill__core__browser__form_structure.cc
 delete mode 100644 www/chromium/files/patch-components__cookie_config__cookie_store_util.cc
 delete mode 100644 www/chromium/files/patch-components__dom_distiller__core__page_features.cc
 delete mode 100644 www/chromium/files/patch-components__drive__drive_api_util.cc
 delete mode 100644 www/chromium/files/patch-components__feedback__anonymizer_tool.cc
 delete mode 100644 www/chromium/files/patch-components__flags_ui__flags_state.cc
 delete mode 100644 www/chromium/files/patch-components__json_schema__json_schema_validator.cc
 delete mode 100644 www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc
 delete mode 100644 www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
 delete mode 100644 www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
 delete mode 100644 www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc
 delete mode 100644 www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc
 delete mode 100644 www/chromium/files/patch-components__policy__core__common__schema.cc
 delete mode 100644 www/chromium/files/patch-components__policy__resources__policy_templates.json
 delete mode 100644 www/chromium/files/patch-components__policy__tools__generate_policy_source.py
 delete mode 100644 www/chromium/files/patch-components__storage_monitor.gypi
 delete mode 100644 www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
 delete mode 100644 www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
 delete mode 100644 www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
 delete mode 100644 www/chromium/files/patch-components__update_client__update_query_params.cc
 delete mode 100644 www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc
 delete mode 100644 www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc
 delete mode 100644 www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc
 create mode 100644 www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
 create mode 100644 www/chromium/files/patch-components_autofill_core_browser_form__structure.cc
 create mode 100644 www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
 create mode 100644 www/chromium/files/patch-components_dom__distiller_core_page__features.cc
 create mode 100644 www/chromium/files/patch-components_drive_drive__api__util.cc
 create mode 100644 www/chromium/files/patch-components_feedback_anonymizer__tool.cc
 create mode 100644 www/chromium/files/patch-components_flags__ui_flags__state.cc
 create mode 100644 www/chromium/files/patch-components_json__schema_json__schema__validator.cc
 create mode 100644 www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
 create mode 100644 www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
 create mode 100644 www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
 create mode 100644 www/chromium/files/patch-components_neterror_resources_neterror.js
 create mode 100644 www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc
 create mode 100644 www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
 create mode 100644 www/chromium/files/patch-components_policy_core_common_schema.cc
 create mode 100644 www/chromium/files/patch-components_policy_resources_policy__templates.json
 create mode 100644 www/chromium/files/patch-components_policy_tools_generate__policy__source.py
 create mode 100644 www/chromium/files/patch-components_storage__monitor.gypi
 create mode 100644 www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
 create mode 100644 www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
 create mode 100644 www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
 create mode 100644 www/chromium/files/patch-components_update__client_update__query__params.cc
 create mode 100644 www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
 create mode 100644 www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
 create mode 100644 www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
 delete mode 100644 www/chromium/files/patch-content__app__content_main_runner.cc
 delete mode 100644 www/chromium/files/patch-content__browser__browser_main_loop.cc
 delete mode 100644 www/chromium/files/patch-content__browser__child_process_launcher.cc
 delete mode 100644 www/chromium/files/patch-content__browser__download__base_file.cc
 delete mode 100644 www/chromium/files/patch-content__browser__download__base_file_linux.cc
 delete mode 100644 www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
 delete mode 100644 www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
 delete mode 100644 www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
 delete mode 100644 www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
 delete mode 100644 www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
 delete mode 100644 www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
 delete mode 100644 www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
 delete mode 100644 www/chromium/files/patch-content__browser__time_zone_monitor.cc
 delete mode 100644 www/chromium/files/patch-content__browser__time_zone_monitor_linux.cc
 delete mode 100644 www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc
 delete mode 100644 www/chromium/files/patch-content__common__set_process_title_linux.cc
 delete mode 100644 www/chromium/files/patch-content__common__set_process_title_linux.h
 delete mode 100644 www/chromium/files/patch-content__content_browser.gypi
 delete mode 100644 www/chromium/files/patch-content__content_common.gypi
 delete mode 100644 www/chromium/files/patch-content__content_tests.gypi
 delete mode 100644 www/chromium/files/patch-content__gpu__gpu_child_thread.cc
 delete mode 100644 www/chromium/files/patch-content__gpu__gpu_main.cc
 delete mode 100644 www/chromium/files/patch-content__public__common__content_switches.cc
 delete mode 100644 www/chromium/files/patch-content__public__common__content_switches.h
 delete mode 100644 www/chromium/files/patch-content__public__test__browser_test_base.cc
 delete mode 100644 www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc
 delete mode 100644 www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
 delete mode 100644 www/chromium/files/patch-content__renderer__render_thread_impl.cc
 delete mode 100644 www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
 delete mode 100644 www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h
 delete mode 100644 www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
 delete mode 100644 www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc
 delete mode 100644 www/chromium/files/patch-content__shell__browser__shell_browser_context.cc
 delete mode 100644 www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc
 create mode 100644 www/chromium/files/patch-content_app_content__main__runner.cc
 create mode 100644 www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h
 create mode 100644 www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
 create mode 100644 www/chromium/files/patch-content_browser_browser__main__loop.cc
 create mode 100644 www/chromium/files/patch-content_browser_child__process__launcher.cc
 create mode 100644 www/chromium/files/patch-content_browser_download_base__file.cc
 create mode 100644 www/chromium/files/patch-content_browser_download_base__file__linux.cc
 create mode 100644 www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc
 create mode 100644 www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc
 create mode 100644 www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h
 create mode 100644 www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
 create mode 100644 www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
 create mode 100644 www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc
 create mode 100644 www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
 create mode 100644 www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
 create mode 100644 www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
 create mode 100644 www/chromium/files/patch-content_browser_time__zone__monitor.cc
 create mode 100644 www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc
 create mode 100644 www/chromium/files/patch-content_browser_utility__process__host__impl.cc
 create mode 100644 www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
 create mode 100644 www/chromium/files/patch-content_common_set__process__title__linux.cc
 create mode 100644 www/chromium/files/patch-content_common_set__process__title__linux.h
 create mode 100644 www/chromium/files/patch-content_content__browser.gypi
 create mode 100644 www/chromium/files/patch-content_content__common.gypi
 create mode 100644 www/chromium/files/patch-content_content__tests.gypi
 create mode 100644 www/chromium/files/patch-content_gpu_gpu__child__thread.cc
 create mode 100644 www/chromium/files/patch-content_gpu_gpu__main.cc
 create mode 100644 www/chromium/files/patch-content_public_common_content__switches.cc
 create mode 100644 www/chromium/files/patch-content_public_common_content__switches.h
 create mode 100644 www/chromium/files/patch-content_public_test_browser__test__base.cc
 create mode 100644 www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc
 create mode 100644 www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc
 create mode 100644 www/chromium/files/patch-content_renderer_render__thread__impl.cc
 create mode 100644 www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
 create mode 100644 www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
 create mode 100644 www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
 create mode 100644 www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc
 create mode 100644 www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
 create mode 100644 www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
 delete mode 100644 www/chromium/files/patch-crypto__nss_util.cc
 create mode 100644 www/chromium/files/patch-crypto_nss__util.cc
 delete mode 100644 www/chromium/files/patch-device__hid__hid.gyp
 delete mode 100644 www/chromium/files/patch-device__serial__serial.gyp
 delete mode 100644 www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
 delete mode 100644 www/chromium/files/patch-device__serial__serial_service_impl.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb.gyp
 delete mode 100644 www/chromium/files/patch-device__usb__usb_context.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb_context_unittest.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb_device_handle_impl.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb_device_handle_impl.h
 delete mode 100644 www/chromium/files/patch-device__usb__usb_device_impl.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb_error.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb_service_impl.cc
 delete mode 100644 www/chromium/files/patch-device__usb__usb_service_impl.h
 create mode 100644 www/chromium/files/patch-device_hid_hid.gyp
 create mode 100644 www/chromium/files/patch-device_serial_serial.gyp
 create mode 100644 www/chromium/files/patch-device_serial_serial__io__handler__posix.cc
 create mode 100644 www/chromium/files/patch-device_serial_serial__service__impl.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb.gyp
 create mode 100644 www/chromium/files/patch-device_usb_usb__context.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb__context__unittest.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb__device__handle__impl.h
 create mode 100644 www/chromium/files/patch-device_usb_usb__device__impl.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb__error.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb__service__impl.cc
 create mode 100644 www/chromium/files/patch-device_usb_usb__service__impl.h
 delete mode 100644 www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc
 delete mode 100644 www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc
 delete mode 100644 www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc
 delete mode 100644 www/chromium/files/patch-extensions__common__image_util.cc
 delete mode 100644 www/chromium/files/patch-extensions__common__stack_frame.cc
 create mode 100644 www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
 create mode 100644 www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
 create mode 100644 www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
 create mode 100644 www/chromium/files/patch-extensions_common_image__util.cc
 create mode 100644 www/chromium/files/patch-extensions_common_stack__frame.cc
 delete mode 100644 www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc
 delete mode 100644 www/chromium/files/patch-gpu__config__gpu_control_list.cc
 delete mode 100644 www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
 delete mode 100644 www/chromium/files/patch-gpu__config__gpu_info_collector.cc
 delete mode 100644 www/chromium/files/patch-gpu__config__gpu_test_config.cc
 delete mode 100644 www/chromium/files/patch-gpu__config__gpu_util.cc
 delete mode 100644 www/chromium/files/patch-gpu__gpu_config.gypi
 create mode 100644 www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
 create mode 100644 www/chromium/files/patch-gpu_config_gpu__control__list.cc
 create mode 100644 www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
 create mode 100644 www/chromium/files/patch-gpu_config_gpu__info__collector.cc
 create mode 100644 www/chromium/files/patch-gpu_config_gpu__test__config.cc
 create mode 100644 www/chromium/files/patch-gpu_gpu__config.gypi
 create mode 100644 www/chromium/files/patch-gpu_gpu__ipc__service.gypi
 create mode 100644 www/chromium/files/patch-ipc_ipc__message__utils.cc
 create mode 100644 www/chromium/files/patch-ipc_ipc__message__utils.h
 delete mode 100644 www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
 delete mode 100644 www/chromium/files/patch-media__audio__audio_manager.cc
 delete mode 100644 www/chromium/files/patch-media__audio__audio_manager.h
 delete mode 100644 www/chromium/files/patch-media__base__audio_splicer.cc
 delete mode 100644 www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
 delete mode 100644 www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
 delete mode 100644 www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
 delete mode 100644 www/chromium/files/patch-media__capture__video__video_capture_device.cc
 delete mode 100644 www/chromium/files/patch-media__capture__video__video_capture_device.h
 delete mode 100644 www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
 delete mode 100644 www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
 delete mode 100644 www/chromium/files/patch-media__filters__vp9_parser.h
 delete mode 100644 www/chromium/files/patch-media__formats__common__offset_byte_queue.cc
 delete mode 100644 www/chromium/files/patch-media__formats__common__offset_byte_queue.h
 delete mode 100644 www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc
 delete mode 100644 www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc
 delete mode 100644 www/chromium/files/patch-media__media.gyp
 create mode 100644 www/chromium/files/patch-media_audio_audio__manager.cc
 create mode 100644 www/chromium/files/patch-media_audio_audio__manager.h
 create mode 100644 www/chromium/files/patch-media_base_audio__splicer.cc
 create mode 100644 www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
 create mode 100644 www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
 create mode 100644 www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
 create mode 100644 www/chromium/files/patch-media_capture_video_video__capture__device.cc
 create mode 100644 www/chromium/files/patch-media_capture_video_video__capture__device.h
 create mode 100644 www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
 create mode 100644 www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc
 create mode 100644 www/chromium/files/patch-media_filters_vp9__parser.h
 create mode 100644 www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
 create mode 100644 www/chromium/files/patch-media_formats_common_offset__byte__queue.h
 create mode 100644 www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
 create mode 100644 www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
 create mode 100644 www/chromium/files/patch-media_media.gyp
 create mode 100644 www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc
 create mode 100644 www/chromium/files/patch-mojo_shell_runner_init.cc
 create mode 100644 www/chromium/files/patch-native__client_build_common.gypi
 create mode 100644 www/chromium/files/patch-native__client_src_shared_platform_platform.gyp
 delete mode 100644 www/chromium/files/patch-native_client__build__common.gypi
 delete mode 100644 www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
 delete mode 100644 www/chromium/files/patch-net__base__address_tracker_linux.cc
 delete mode 100644 www/chromium/files/patch-net__base__address_tracker_linux.h
 delete mode 100644 www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
 delete mode 100644 www/chromium/files/patch-net__base__mime_util_unittest.cc
 delete mode 100644 www/chromium/files/patch-net__base__network_change_notifier.cc
 delete mode 100644 www/chromium/files/patch-net__base__network_interfaces_linux.cc
 delete mode 100644 www/chromium/files/patch-net__base__network_interfaces_posix.cc
 delete mode 100644 www/chromium/files/patch-net__dns__address_sorter_posix.cc
 delete mode 100644 www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
 delete mode 100644 www/chromium/files/patch-net__dns__dns_reloader.cc
 delete mode 100644 www/chromium/files/patch-net__dns__dns_session.cc
 delete mode 100644 www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
 delete mode 100644 www/chromium/files/patch-net__net.gyp
 delete mode 100644 www/chromium/files/patch-net__net.gypi
 delete mode 100644 www/chromium/files/patch-net__net_common.gypi
 delete mode 100644 www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
 delete mode 100644 www/chromium/files/patch-net__proxy__proxy_service.cc
 delete mode 100644 www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
 delete mode 100644 www/chromium/files/patch-net__socket__socks5_client_socket.cc
 delete mode 100644 www/chromium/files/patch-net__udp__udp_socket_unittest.cc
 create mode 100644 www/chromium/files/patch-net_base_address__tracker__linux.cc
 create mode 100644 www/chromium/files/patch-net_base_address__tracker__linux.h
 create mode 100644 www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
 create mode 100644 www/chromium/files/patch-net_base_mime__util__unittest.cc
 create mode 100644 www/chromium/files/patch-net_base_network__change__notifier.cc
 create mode 100644 www/chromium/files/patch-net_base_network__interfaces__linux.cc
 create mode 100644 www/chromium/files/patch-net_base_network__interfaces__posix.cc
 create mode 100644 www/chromium/files/patch-net_dns_address__sorter__posix.cc
 create mode 100644 www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
 create mode 100644 www/chromium/files/patch-net_dns_dns__reloader.cc
 create mode 100644 www/chromium/files/patch-net_dns_dns__session.cc
 create mode 100644 www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
 create mode 100644 www/chromium/files/patch-net_net.gyp
 create mode 100644 www/chromium/files/patch-net_net.gypi
 create mode 100644 www/chromium/files/patch-net_net__common.gypi
 create mode 100644 www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
 create mode 100644 www/chromium/files/patch-net_proxy_proxy__service.cc
 create mode 100644 www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc
 create mode 100644 www/chromium/files/patch-net_socket_socks5__client__socket.cc
 create mode 100644 www/chromium/files/patch-net_udp_udp__socket__unittest.cc
 create mode 100644 www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
 delete mode 100644 www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
 delete mode 100644 www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
 create mode 100644 www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
 create mode 100644 www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
 delete mode 100644 www/chromium/files/patch-printing__printing.gyp
 create mode 100644 www/chromium/files/patch-printing_printing.gyp
 delete mode 100644 www/chromium/files/patch-remoting__remoting_host.gypi
 create mode 100644 www/chromium/files/patch-remoting_remoting__host.gypi
 delete mode 100644 www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp
 delete mode 100644 www/chromium/files/patch-skia__skia_chrome.gypi
 delete mode 100644 www/chromium/files/patch-skia__skia_common.gypi
 create mode 100644 www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
 create mode 100644 www/chromium/files/patch-skia_skia__chrome.gypi
 create mode 100644 www/chromium/files/patch-skia_skia__common.gypi
 delete mode 100644 www/chromium/files/patch-sync__util__get_session_name.cc
 delete mode 100644 www/chromium/files/patch-sync__util__get_session_name_linux.cc
 create mode 100644 www/chromium/files/patch-sync_util_get__session__name.cc
 create mode 100644 www/chromium/files/patch-sync_util_get__session__name__linux.cc
 delete mode 100644 www/chromium/files/patch-testing__gtest__src__gtest.cc
 create mode 100644 www/chromium/files/patch-testing_gtest_src_gtest.cc
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
 create mode 100644 www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp
 create mode 100644 www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
 create mode 100644 www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
 create mode 100644 www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h
 create mode 100644 www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py
 create mode 100644 www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
 create mode 100644 www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi
 create mode 100644 www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
 create mode 100644 www/chromium/files/patch-third__party_flac_flac.gyp
 create mode 100644 www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp
 create mode 100644 www/chromium/files/patch-third__party_khronos_khronos.gyp
 create mode 100644 www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
 create mode 100644 www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp
 create mode 100644 www/chromium/files/patch-third__party_libjingle_libjingle.gyp
 create mode 100644 www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp
 create mode 100644 www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
 create mode 100644 www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp
 create mode 100644 www/chromium/files/patch-third__party_libusb_libusb.gyp
 create mode 100644 www/chromium/files/patch-third__party_libwebp_libwebp.gyp
 create mode 100644 www/chromium/files/patch-third__party_libxml_libxml.gyp
 create mode 100644 www/chromium/files/patch-third__party_libxslt_libxslt.gyp
 create mode 100644 www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
 create mode 100644 www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h
 create mode 100644 www/chromium/files/patch-third__party_pdfium_build_standalone.gypi
 create mode 100644 www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h
 create mode 100644 www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
 create mode 100644 www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
 create mode 100644 www/chromium/files/patch-third__party_pdfium_pdfium.gyp
 create mode 100644 www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h
 create mode 100644 www/chromium/files/patch-third__party_re2_re2.gyp
 create mode 100644 www/chromium/files/patch-third__party_sfntly_sfntly.gyp
 create mode 100644 www/chromium/files/patch-third__party_snappy_snappy.gyp
 create mode 100644 www/chromium/files/patch-third__party_sqlite_sqlite.gyp
 create mode 100644 www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_ipaddress.h
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_linux.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_linux.h
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_network.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_network.h
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_stringutils.h
 create mode 100644 www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_build_common.gypi
 create mode 100644 www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi
 create mode 100644 www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi
 create mode 100644 www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc
 create mode 100644 www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
 delete mode 100644 www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
 delete mode 100644 www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py
 delete mode 100644 www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni
 delete mode 100644 www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
 delete mode 100644 www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
 delete mode 100644 www/chromium/files/patch-third_party__khronos__khronos.gyp
 delete mode 100644 www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc
 delete mode 100644 www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
 delete mode 100644 www/chromium/files/patch-third_party__libexif__libexif.gyp
 delete mode 100644 www/chromium/files/patch-third_party__libjingle__libjingle.gyp
 delete mode 100644 www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
 delete mode 100644 www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
 delete mode 100644 www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h
 delete mode 100644 www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
 delete mode 100644 www/chromium/files/patch-third_party__pdfium__build__standalone.gypi
 delete mode 100644 www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h
 delete mode 100644 www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
 delete mode 100644 www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
 delete mode 100644 www/chromium/files/patch-third_party__pdfium__pdfium.gyp
 delete mode 100644 www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h
 delete mode 100644 www/chromium/files/patch-third_party__sfntly__sfntly.gyp
 delete mode 100644 www/chromium/files/patch-third_party__sqlite__sqlite.gyp
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__linux.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__linux.h
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__network.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__network.h
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__stringutils.h
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__build__common.gypi
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__modules__video_coding__receiver.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
 delete mode 100644 www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
 delete mode 100644 www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
 delete mode 100644 www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
 delete mode 100644 www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
 create mode 100644 www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py
 create mode 100644 www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp
 create mode 100644 www/chromium/files/patch-tools_gyp_test_library_src_library.gyp
 delete mode 100644 www/chromium/files/patch-ui__accessibility__accessibility.gyp
 delete mode 100644 www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.h
 delete mode 100644 www/chromium/files/patch-ui__app_list__app_list_constants.cc
 delete mode 100644 www/chromium/files/patch-ui__app_list__app_list_constants.h
 delete mode 100644 www/chromium/files/patch-ui__app_list__app_list_menu.cc
 delete mode 100644 www/chromium/files/patch-ui__app_list__views__app_list_view.cc
 delete mode 100644 www/chromium/files/patch-ui__base__ime__input_method_factory.cc
 delete mode 100644 www/chromium/files/patch-ui__base__ime__input_method_initializer.cc
 delete mode 100644 www/chromium/files/patch-ui__base__resource__resource_bundle.cc
 delete mode 100644 www/chromium/files/patch-ui__base__ui_base.gyp
 delete mode 100644 www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc
 delete mode 100644 www/chromium/files/patch-ui__base__web_ui_util.cc
 delete mode 100644 www/chromium/files/patch-ui__events__event_switches.cc
 delete mode 100644 www/chromium/files/patch-ui__events__event_switches.h
 delete mode 100644 www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
 delete mode 100644 www/chromium/files/patch-ui__gfx__canvas_skia.cc
 delete mode 100644 www/chromium/files/patch-ui__gfx__render_text.cc
 delete mode 100644 www/chromium/files/patch-ui__gl__gl.gyp
 delete mode 100644 www/chromium/files/patch-ui__gl__gl_surface_glx.cc
 delete mode 100644 www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
 delete mode 100644 www/chromium/files/patch-ui__message_center__message_center_style.h
 delete mode 100644 www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc
 delete mode 100644 www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h
 delete mode 100644 www/chromium/files/patch-ui__message_center__views__message_center_view.cc
 delete mode 100644 www/chromium/files/patch-ui__message_center__views__notification_view.cc
 delete mode 100644 www/chromium/files/patch-ui__resources__ui_resources.grd
 delete mode 100644 www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
 delete mode 100644 www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.h
 delete mode 100644 www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
 delete mode 100644 www/chromium/files/patch-ui__views__controls__button__label_button.cc
 delete mode 100644 www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc
 delete mode 100644 www/chromium/files/patch-ui__views__controls__textfield__textfield.cc
 delete mode 100644 www/chromium/files/patch-ui__views__controls__webview__webview.gyp
 delete mode 100644 www/chromium/files/patch-ui__views__examples__widget_example.cc
 delete mode 100644 www/chromium/files/patch-ui__views__views.gyp
 delete mode 100644 www/chromium/files/patch-ui__views__views_delegate.cc
 delete mode 100644 www/chromium/files/patch-ui__views__views_delegate.h
 delete mode 100644 www/chromium/files/patch-ui__views__views_switches.cc
 delete mode 100644 www/chromium/files/patch-ui__views__window__custom_frame_view.cc
 delete mode 100644 www/chromium/files/patch-ui__views__window__dialog_delegate.cc
 delete mode 100644 www/chromium/files/patch-ui__webui__resources__js__cr.js
 delete mode 100644 www/chromium/files/patch-ui__webui__resources__js__util.js
 create mode 100644 www/chromium/files/patch-ui_accessibility_accessibility.gyp
 create mode 100644 www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h
 create mode 100644 www/chromium/files/patch-ui_app__list_app__list__constants.cc
 create mode 100644 www/chromium/files/patch-ui_app__list_app__list__constants.h
 create mode 100644 www/chromium/files/patch-ui_app__list_app__list__menu.cc
 create mode 100644 www/chromium/files/patch-ui_app__list_views_app__list__view.cc
 create mode 100644 www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
 create mode 100644 www/chromium/files/patch-ui_base_ime_input__method__factory.cc
 create mode 100644 www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
 create mode 100644 www/chromium/files/patch-ui_base_resource_resource__bundle.cc
 create mode 100644 www/chromium/files/patch-ui_base_ui__base.gyp
 create mode 100644 www/chromium/files/patch-ui_base_webui_web__ui__util.cc
 create mode 100644 www/chromium/files/patch-ui_events_event__switches.cc
 create mode 100644 www/chromium/files/patch-ui_events_event__switches.h
 create mode 100644 www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
 create mode 100644 www/chromium/files/patch-ui_gfx_canvas__skia.cc
 create mode 100644 www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
 create mode 100644 www/chromium/files/patch-ui_gfx_font__render__params.h
 create mode 100644 www/chromium/files/patch-ui_gfx_render__text.cc
 create mode 100644 www/chromium/files/patch-ui_gl_gl.gyp
 create mode 100644 www/chromium/files/patch-ui_gl_gl__surface__glx.cc
 create mode 100644 www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
 create mode 100644 www/chromium/files/patch-ui_message__center_message__center__style.h
 create mode 100644 www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc
 create mode 100644 www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h
 create mode 100644 www/chromium/files/patch-ui_message__center_views_message__center__view.cc
 create mode 100644 www/chromium/files/patch-ui_message__center_views_notification__view.cc
 create mode 100644 www/chromium/files/patch-ui_resources_ui__resources.grd
 create mode 100644 www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
 create mode 100644 www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc
 create mode 100644 www/chromium/files/patch-ui_views_controls_button_label__button.cc
 create mode 100644 www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc
 create mode 100644 www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
 create mode 100644 www/chromium/files/patch-ui_views_controls_webview_webview.gyp
 create mode 100644 www/chromium/files/patch-ui_views_examples_widget__example.cc
 create mode 100644 www/chromium/files/patch-ui_views_style_platform__style.cc
 create mode 100644 www/chromium/files/patch-ui_views_views.gyp
 create mode 100644 www/chromium/files/patch-ui_views_views__delegate.cc
 create mode 100644 www/chromium/files/patch-ui_views_views__delegate.h
 create mode 100644 www/chromium/files/patch-ui_views_views__switches.cc
 create mode 100644 www/chromium/files/patch-ui_views_window_custom__frame__view.cc
 create mode 100644 www/chromium/files/patch-ui_views_window_dialog__delegate.cc
 create mode 100644 www/chromium/files/patch-ui_webui_resources_js_cr.js
 create mode 100644 www/chromium/files/patch-ui_webui_resources_js_util.js
 delete mode 100644 www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
 create mode 100644 www/chromium/files/patch-v8_src_base_platform_platform-posix.cc

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 6de525efbc0c..c52954cea141 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chromium
-PORTVERSION=	49.0.2623.112
+PORTVERSION=	51.0.2704.84
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on
@@ -25,34 +25,35 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:devel/gperf \
 		${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \
 		${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib
 
-LIB_DEPENDS=	libcairo.so:graphics/cairo \
+LIB_DEPENDS=	libasound.so:audio/alsa-lib \
+		libcairo.so:graphics/cairo \
+		libcups.so:print/cups \
 		libdbus-1.so:devel/dbus \
 		libdbus-glib-1.so:devel/dbus-glib \
-		libasound.so:audio/alsa-lib \
-		libfreetype.so:print/freetype2 \
-		libnss3.so:security/nss \
+		libdrm.so:graphics/libdrm \
+		libexpat.so:textproc/expat2 \
 		libFLAC.so:audio/flac \
+		libfreetype.so:print/freetype2 \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libharfbuzz.so:print/harfbuzz \
-		libcups.so:print/cups \
 		libevent.so:devel/libevent2 \
 		libexif.so:graphics/libexif \
+		libfontconfig.so:x11-fonts/fontconfig \
 		libgcrypt.so:security/libgcrypt \
-		libpci.so:devel/libpci \
-		libdrm.so:graphics/libdrm \
 		libicuuc.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libnspr4.so:devel/nspr \
+		libnss3.so:security/nss \
+		libpci.so:devel/libpci \
 		libpng.so:graphics/png \
 		libre2.so:devel/re2 \
 		libsnappy.so:archivers/snappy \
 		libspeechd.so:accessibility/speech-dispatcher \
 		libspeex.so:audio/speex \
-		libxml2.so:textproc/libxml2 \
-		libwebp.so:graphics/webp
+		libwebp.so:graphics/webp \
+		libxml2.so:textproc/libxml2
 
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \
-		alsa-lib>=1.1.1_1:audio/alsa-lib \
 		droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \
 		xdg-open:devel/xdg-utils
 
@@ -73,14 +74,16 @@ USES+=	compiler:c++11-lib
 CPE_VENDOR=	google
 CPE_PRODUCT=	chrome
 USE_PERL5=	build
-USE_XORG=	scrnsaverproto x11 xproto xscrnsaver xtst
+USE_XORG=	scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \
+		xproto xrandr xrender xscrnsaver xtst
 USE_GNOME=	atk glib20 gtk20 dconf libxslt
 MAKE_ARGS=	-C out/${BUILDTYPE}
 SHEBANG_FILES=	chrome/tools/build/linux/chrome-wrapper
 ALL_TARGET=	chrome
 INSTALLS_ICONS=	yes
 
-#TODO bz@ : if you do undestand the gyp stuff, third_party/widevine/cdm/widevine_cdm.gyp talks about it (plz install libwidevinecdm.so)
+#TODO bz@ : install libwidevinecdm.so (see
+#   third_party/widevine/cdm/widevine_cdm.gyp)
 # See build/common.gypi for all the available variables.
 GYP_DEFINES+=	\
 		clang_use_chrome_plugins=0 \
@@ -96,6 +99,7 @@ GYP_DEFINES+=	\
 		enable_webrtc=1 \
 		werror= \
 		no_gc_sections=1 \
+                OS=freebsd \
 		os_ver=${OSVERSION} \
 		prefix_dir=${LOCALBASE} \
 		python_ver=${PYTHON_VER} \
@@ -176,7 +180,7 @@ GYP_DEFINES+=	use_pulseaudio=1
 GYP_DEFINES+=	use_pulseaudio=0
 .endif
 
-.if ! ${MACHINE_CPU:Msse2}
+.if empty(MACHINE_CPU:Msse2)
 GYP_DEFINES+=	disable_sse2=1
 .endif
 
@@ -314,8 +318,8 @@ pre-configure:
 		'third_party/libjingle' \
 		'third_party/libphonenumber' \
 		'third_party/libsrtp' \
-		'third_party/libvpx_new' \
-		'third_party/libvpx_new/source/libvpx/third_party/x86inc' \
+		'third_party/libvpx' \
+		'third_party/libvpx/source/libvpx/third_party/x86inc' \
 		'third_party/libwebm' \
 		'third_party/libxml/chromium' \
 		'third_party/libXNVCtrl' \
@@ -324,10 +328,9 @@ pre-configure:
 		'third_party/lzma_sdk' \
 		'third_party/markupsafe' \
 		'third_party/mesa' \
-		'third_party/mojo' \
 		'third_party/modp_b64' \
 		'third_party/mt19937ar' \
-		'third_party/npapi' \
+		'third_party/openh264' \
 		'third_party/openmax_dl' \
 		'third_party/opus' \
 		'third_party/ots' \
@@ -396,7 +399,8 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \
 		${STAGEDIR}${DATADIR}
 	cd ${WRKSRC}/out/${BUILDTYPE} && \
-		${COPYTREE_SHARE} "locales resources" ${STAGEDIR}${DATADIR}
+		${COPYTREE_SHARE} "locales pseudo_locales resources" ${STAGEDIR}${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	@${MKDIR} ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \
 		${STAGEDIR}${DESKTOPDIR}
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index 4d9ef2f3a53d..ed8700a25269 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,4 +1,5 @@
-SHA256 (chromium-49.0.2623.112.tar.xz) = 443b6d5f0d07f336783e700edc4ecae96769e105d0f8553e98fefae747302cf0
-SIZE (chromium-49.0.2623.112.tar.xz) = 520397552
-SHA256 (chromium-49.0.2623.112-testdata.tar.xz) = 2822d6ebfdab23b018aeba78bfb448be68c3ac6de3fed7fe649500c4341abe49
-SIZE (chromium-49.0.2623.112-testdata.tar.xz) = 117571488
+TIMESTAMP = 1465247626
+SHA256 (chromium-51.0.2704.84.tar.xz) = 33a3fe1cb8fa5be7b35aa8ae00c8b0a6dc90975bfa9aea9865180b57b0a4dc6a
+SIZE (chromium-51.0.2704.84.tar.xz) = 448556852
+SHA256 (chromium-51.0.2704.84-testdata.tar.xz) = f74796ad850f874df407dd624eeb3a887d6d4fff312c79d4269f370f179490a1
+SIZE (chromium-51.0.2704.84-testdata.tar.xz) = 121441480
diff --git a/www/chromium/files/patch-base__base.gyp b/www/chromium/files/patch-base__base.gyp
deleted file mode 100644
index 13b6a98477e4..000000000000
--- a/www/chromium/files/patch-base__base.gyp
+++ /dev/null
@@ -1,23 +0,0 @@
---- base/base.gyp.orig	2014-10-10 09:15:29 UTC
-+++ base/base.gyp
-@@ -129,7 +129,7 @@
-           ],
-           'link_settings': {
-             'libraries': [
--              '-L/usr/local/lib -lexecinfo',
-+              '-L/usr/local/lib -lexecinfo -lkvm',
-             ],
-           },
-         }],
-@@ -803,6 +803,11 @@
-             ['include', '^debug/proc_maps_linux_unittest\\.cc$'],
-           ],
-         }],
-+        ['OS == "freebsd"', {
-+          'sources!': [
-+            'debug/proc_maps_linux_unittest.cc',
-+          ],
-+        }],
-       ],  # target_conditions
-     },
-     {
diff --git a/www/chromium/files/patch-base__base.gypi b/www/chromium/files/patch-base__base.gypi
deleted file mode 100644
index 9ddefad7a81e..000000000000
--- a/www/chromium/files/patch-base__base.gypi
+++ /dev/null
@@ -1,20 +0,0 @@
---- base/base.gypi.orig	2014-10-10 09:15:29 UTC
-+++ base/base.gypi
-@@ -945,11 +945,16 @@
-               'process/memory_stubs.cc',
-             ],
-             'sources/': [
-+              ['exclude', '^debug/proc_maps_linux\\.cc$'],
-               ['exclude', '^files/file_path_watcher_linux\\.cc$'],
--              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
-               ['exclude', '^files/file_util_linux\\.cc$'],
-+              ['exclude', '^process/memory_linux\\.cc$'],
-               ['exclude', '^process/process_linux\\.cc$'],
-               ['exclude', '^sys_info_linux\\.cc$'],
-+              ['exclude', '^process/process_iterator_linux\\.cc$'],
-+              ['exclude', '^process/process_metrics_linux\\.cc$'],
-+              ['exclude', '^files/file_path_watcher_fsevents\\.cc$'],
-+              ['exclude', '^files/file_path_watcher_fsevents\\.h$'],
-             ],
-           }],
-           # Remove all unnecessary files for build_nexe.py to avoid exceeding
diff --git a/www/chromium/files/patch-base__debug__stack_trace_posix.cc b/www/chromium/files/patch-base__debug__stack_trace_posix.cc
deleted file mode 100644
index 012c7b6df124..000000000000
--- a/www/chromium/files/patch-base__debug__stack_trace_posix.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- base/debug/stack_trace_posix.cc.orig	2014-10-10 09:15:29 UTC
-+++ base/debug/stack_trace_posix.cc
-@@ -588,6 +588,10 @@
-   // for the modules that are loaded in the current process.
-   // Returns true on success.
-   bool CacheMemoryRegions() {
-+#if defined(OS_FREEBSD)
-+    // TODO (rene) avoid link error, implement something?
-+    return false;
-+#else
-     // Reads /proc/self/maps.
-     std::string contents;
-     if (!ReadProcMaps(&contents)) {
-@@ -603,6 +607,7 @@
- 
-     is_initialized_ = true;
-     return true;
-+#endif
-   }
- 
-   // Opens all object files and caches their file descriptors.
diff --git a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h b/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
deleted file mode 100644
index 889fbe8c8aed..000000000000
--- a/www/chromium/files/patch-base__files__file_path_watcher_kqueue.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/files/file_path_watcher_kqueue.h.orig	2014-10-10 09:15:29 UTC
-+++ base/files/file_path_watcher_kqueue.h
-@@ -5,6 +5,10 @@
- #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
- #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
- 
-+#ifdef __FreeBSD__
-+#include <sys/stdint.h>
-+#include <sys/types.h>
-+#endif
- #include <sys/event.h>
- #include <vector>
- 
diff --git a/www/chromium/files/patch-base__move.h b/www/chromium/files/patch-base__move.h
deleted file mode 100644
index 216779e03d6c..000000000000
--- a/www/chromium/files/patch-base__move.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/move.h.orig	2016-03-05 17:46:48.797428036 +0100
-+++ base/move.h	2016-03-05 17:47:02.108427026 +0100
-@@ -31,7 +31,7 @@
- // for more details.
- // TODO(crbug.com/566182): Remove this macro and use DISALLOW_COPY_AND_ASSIGN
- // everywhere instead.
--#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)
-+#if (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_MACOSX)) && !defined(OS_BSD)
- #define DISALLOW_COPY_AND_ASSIGN_WITH_MOVE_FOR_BIND(type)       \
-  private:                                                       \
-   type(const type&) = delete;                                   \
diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
deleted file mode 100644
index fc61bf9757a6..000000000000
--- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux.cc
+++ /dev/null
@@ -1,44 +0,0 @@
---- base/posix/unix_domain_socket_linux.cc.orig	2015-05-13 18:23:01.000000000 -0400
-+++ base/posix/unix_domain_socket_linux.cc 2015-05-20 09:09:12.131544000 -0400
-@@ -21,6 +21,15 @@
- #include <sys/uio.h>
- #endif
- 
-+#if defined(__FreeBSD__)
-+// Port over Linux ucred structure
-+struct ucred {
-+  pid_t pid; // process ID of the sending process
-+  uid_t uid; // user ID of the sending process
-+  gid_t gid; // group ID of the sending process
-+};
-+#endif
-+
- const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
- 
- #if !defined(OS_NACL_NONSFI)
-@@ -39,7 +48,13 @@
- // static
- bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
-   const int enable = 1;
-+#if defined(__FreeBSD__)
-+  // XXX(rene) do this? :
-+  // taken from dbus, Academic Free License 2.1 / GPL 2+
-+  return 0; // fake OK
-+#else
-   return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
-+#endif
- }
- #endif  // !defined(OS_NACL_NONSFI)
- 
-@@ -145,7 +160,11 @@
-       // The PNaCl toolchain for Non-SFI binary build does not support
-       // SCM_CREDENTIALS.
-       if (cmsg->cmsg_level == SOL_SOCKET &&
-+#if defined(__FreeBSD__)
-+        1) { // XXX(rene) carpet getting full ...
-+#else
-           cmsg->cmsg_type == SCM_CREDENTIALS) {
-+#endif
-         DCHECK_EQ(payload_len, sizeof(struct ucred));
-         DCHECK_EQ(pid, -1);
-         pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
diff --git a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc b/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
deleted file mode 100644
index 9803d866f2c5..000000000000
--- a/www/chromium/files/patch-base__posix__unix_domain_socket_linux_unittest.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- base/posix/unix_domain_socket_linux_unittest.cc.orig	2016-03-02 22:40:17.347033545 +0100
-+++ base/posix/unix_domain_socket_linux_unittest.cc	2016-03-02 22:40:44.347072090 +0100
-@@ -2,10 +2,15 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
-+#include "build/build_config.h"
-+
- #include <stddef.h>
- #include <stdint.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#if defined(OS_BSD)
-+#include <signal.h>
-+#endif
- #include <unistd.h>
- 
- #include "base/bind.h"
diff --git a/www/chromium/files/patch-base__process__internal_linux.h b/www/chromium/files/patch-base__process__internal_linux.h
deleted file mode 100644
index 59eadfbe48e8..000000000000
--- a/www/chromium/files/patch-base__process__internal_linux.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/process/internal_linux.h.orig	2014-10-10 08:54:09 UTC
-+++ base/process/internal_linux.h
-@@ -12,6 +12,8 @@
- 
- #include "base/files/file_path.h"
- 
-+#include <unistd.h> /* pid_t */
-+
- namespace base {
- 
- class Time;
diff --git a/www/chromium/files/patch-base__process__launch.cc b/www/chromium/files/patch-base__process__launch.cc
deleted file mode 100644
index d57dc870f635..000000000000
--- a/www/chromium/files/patch-base__process__launch.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- base/process/launch.cc.orig	2015-05-13 18:23:01.000000000 -0400
-+++ base/process/launch.cc	2015-05-20 09:12:01.335764000 -0400
-@@ -24,11 +24,11 @@
-       fds_to_remap(NULL),
-       maximize_rlimits(NULL),
-       new_process_group(false)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-       , clone_flags(0)
-       , allow_new_privs(false)
-       , kill_on_parent_death(false)
--#endif  // OS_LINUX
-+#endif  // OS_LINUX || OS_FREEBSD
- #if defined(OS_POSIX)
-       , pre_exec_delegate(NULL)
- #endif  // OS_POSIX
diff --git a/www/chromium/files/patch-base__process__launch.h b/www/chromium/files/patch-base__process__launch.h
deleted file mode 100644
index 2f447d78b59b..000000000000
--- a/www/chromium/files/patch-base__process__launch.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- base/process/launch.h.orig	2015-05-13 18:23:01.000000000 -0400
-+++ base/process/launch.h	2015-05-20 09:13:38.326203000 -0400
-@@ -131,7 +131,7 @@
-   // will be the same as its pid.
-   bool new_process_group;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   // If non-zero, start the process using clone(), using flags as provided.
-   // Unlike in clone, clone_flags may not contain a custom termination signal
-   // that is sent to the parent when the child dies. The termination signal will
-@@ -144,7 +144,7 @@
- 
-   // Sets parent process death signal to SIGKILL.
-   bool kill_on_parent_death;
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_FREEBSD)
- 
- #if defined(OS_POSIX)
-   // If not empty, change to this directory before execing the new process.
diff --git a/www/chromium/files/patch-base__process__memory.cc b/www/chromium/files/patch-base__process__memory.cc
deleted file mode 100644
index de93f9056c09..000000000000
--- a/www/chromium/files/patch-base__process__memory.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- base/process/memory.cc.orig	2015-05-21 15:20:26.547966000 -0400
-+++ base/process/memory.cc	2015-05-21 15:24:31.421919000 -0400
-@@ -45,4 +45,36 @@
- 
- #endif
- 
-+#if defined(OS_FREEBSD)
-+
-+#if defined(USE_TCMALLOC)
-+// Used by UncheckedMalloc. If tcmalloc is linked to the executable
-+// this will be replaced by a strong symbol that actually implement
-+// the semantics and don't call new handler in case the allocation fails.
-+extern "C" {
-+      
-+__attribute__((weak, visibility("default")))
-+void* tc_malloc_skip_new_handler_weak(size_t size);
-+
-+void* tc_malloc_skip_new_handler_weak(size_t size) {
-+  return malloc(size);
-+}
-+
-+}
-+#endif
-+
-+bool UncheckedMalloc(size_t size, void** result) {
-+#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \ 
-+    (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
-+  *result = malloc(size);
-+#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
-+  *result = __libc_malloc(size);
-+#elif defined(USE_TCMALLOC)
-+  *result = tc_malloc_skip_new_handler_weak(size);
-+#endif
-+  return *result != NULL;
-+}
-+
-+#endif // defined(OS_FREEBSD)
-+
- }  // namespace base
diff --git a/www/chromium/files/patch-base__process__memory_stubs.cc b/www/chromium/files/patch-base__process__memory_stubs.cc
deleted file mode 100644
index 62dd8e8e488e..000000000000
--- a/www/chromium/files/patch-base__process__memory_stubs.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- base/process/memory_stubs.cc.orig	2016-01-21 20:31:40.145997166 +0100
-+++ base/process/memory_stubs.cc	2016-01-21 20:34:18.367986479 +0100
-@@ -26,6 +26,8 @@
- // their respective stdlib function since those functions will return null on a
- // failure to allocate.
- 
-+#if !defined(OS_FREEBSD)
-+// FreeBSD brings it's own implementation in memory.cc -- cmt
- bool UncheckedMalloc(size_t size, void** result) {
-   *result = malloc(size);
-   return *result != nullptr;
-@@ -35,5 +37,6 @@
-   *result = calloc(num_items, size);
-   return *result != nullptr;
- }
-+#endif
- 
- }  // namespace base
diff --git a/www/chromium/files/patch-base__process__memory_unittest.cc b/www/chromium/files/patch-base__process__memory_unittest.cc
deleted file mode 100644
index cdb6ffc50edf..000000000000
--- a/www/chromium/files/patch-base__process__memory_unittest.cc
+++ /dev/null
@@ -1,23 +0,0 @@
---- base/process/memory_unittest.cc.orig	2015-12-04 20:12:12.356919000 +0100
-+++ base/process/memory_unittest.cc	2015-12-04 20:14:11.966272000 +0100
-@@ -137,11 +137,11 @@
- #endif  // defined(OS_MACOSX)
- 
- // Android doesn't implement set_new_handler, so we can't use the
--// OutOfMemoryTest cases. OpenBSD does not support these tests either.
-+// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either.
- // Don't test these on ASan/TSan/MSan configurations: only test the real
- // allocator.
- // Windows only supports these tests with the allocator shim in place.
--#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&   \
-+#if !defined(OS_ANDROID) && !defined(OS_BSD) &&   \
-     !(defined(OS_WIN) && !defined(ALLOCATOR_SHIM)) && \
-     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
- 
-@@ -483,5 +483,5 @@
-   EXPECT_TRUE(value_ == NULL);
- }
- #endif  // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
--#endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) &&
-+#endif  // !defined(OS_ANDROID) && !defined(OS_BSD) && !(defined(OS_WIN) &&
-         // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
diff --git a/www/chromium/files/patch-base__process__process_info_linux.cc b/www/chromium/files/patch-base__process__process_info_linux.cc
deleted file mode 100644
index 9ce09dad68e6..000000000000
--- a/www/chromium/files/patch-base__process__process_info_linux.cc
+++ /dev/null
@@ -1,39 +0,0 @@
---- base/process/process_info_linux.cc.orig	2015-10-14 16:18:44.939415000 +0200
-+++ base/process/process_info_linux.cc	2015-10-14 16:22:36.086176000 +0200
-@@ -10,10 +10,28 @@
- #include "base/process/process_handle.h"
- #include "base/time/time.h"
- 
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#endif
-+
- namespace base {
- 
- // static
- const Time CurrentProcessInfo::CreationTime() {
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
-+  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
-+  struct kinfo_proc proc;
-+  size_t len = sizeof(struct kinfo_proc);
-+  if (sysctl(mib, arraysize(mib), &proc, &len, NULL, 0) < 0)
-+    return Time();
-+#if defined(__DragonFly__)
-+  return Time::FromTimeVal(proc.kp_start);
-+#else
-+  return Time::FromTimeVal(proc.ki_start);
-+#endif
-+#else
-   ProcessHandle pid = GetCurrentProcessHandle();
-   int64 start_ticks =
-       internal::ReadProcStatsAndGetFieldAsInt64(pid, internal::VM_STARTTIME);
-@@ -22,6 +40,7 @@
-   Time boot_time = internal::GetBootTime();
-   DCHECK(!boot_time.is_null());
-   return Time(boot_time + start_offset);
-+#endif
- }
- 
- }  // namespace base
diff --git a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc b/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
deleted file mode 100644
index 1fd05997f2f6..000000000000
--- a/www/chromium/files/patch-base__process__process_iterator_freebsd.cc
+++ /dev/null
@@ -1,36 +0,0 @@
---- base/process/process_iterator_freebsd.cc.orig	2014-10-10 08:54:09 UTC
-+++ base/process/process_iterator_freebsd.cc
-@@ -8,6 +8,10 @@
- #include <sys/sysctl.h>
- #include <unistd.h>
- 
-+/* getuid() */
-+#include <unistd.h>
-+#include <sys/types.h>
-+
- #include "base/logging.h"
- #include "base/strings/string_util.h"
- 
-@@ -68,19 +72,13 @@
-   for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
-     size_t length;
-     struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
--    int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid };
-+    int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid };
- 
-     if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB))
-       continue;
- 
--    length = 0;
--    if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) {
--      LOG(ERROR) << "failed to figure out the buffer size for a command line";
--      continue;
--    }
--
--    data.resize(length);
--
-+    data.resize(ARG_MAX);
-+    length = ARG_MAX;
-     if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) {
-       LOG(ERROR) << "failed to fetch a commandline";
-       continue;
diff --git a/www/chromium/files/patch-base__process__process_metrics.h b/www/chromium/files/patch-base__process__process_metrics.h
deleted file mode 100644
index 8899e69cc64e..000000000000
--- a/www/chromium/files/patch-base__process__process_metrics.h
+++ /dev/null
@@ -1,34 +0,0 @@
---- base/process/process_metrics.h.orig	2014-10-10 08:54:09 UTC
-+++ base/process/process_metrics.h
-@@ -17,6 +17,13 @@
- #include "base/time/time.h"
- #include "base/values.h"
- 
-+#if defined(OS_BSD)
-+#include <kvm.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#endif
-+
- #if defined(OS_MACOSX)
- #include <mach/mach.h>
- #endif
-@@ -246,13 +253,17 @@
- // CPU-related ticks.  Returns -1 on parse error.
- // Exposed for testing.
- BASE_EXPORT int ParseProcStatCPU(const std::string& input);
-+#endif
- 
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
- // Get the number of threads of |process| as available in /proc/<pid>/stat.
- // This should be used with care as no synchronization with running threads is
- // done. This is mostly useful to guarantee being single-threaded.
- // Returns 0 on failure.
- BASE_EXPORT int GetNumberOfThreads(ProcessHandle process);
-+#endif
- 
-+#if defined(OS_LINUX) || defined(OS_ANDROID)
- // /proc/self/exe refers to the current executable.
- BASE_EXPORT extern const char kProcSelfExe[];
- 
diff --git a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc b/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
deleted file mode 100644
index 674c13873f3d..000000000000
--- a/www/chromium/files/patch-base__process__process_metrics_freebsd.cc
+++ /dev/null
@@ -1,36 +0,0 @@
---- base/process/process_metrics_freebsd.cc.orig	2014-10-10 08:54:09 UTC
-+++ base/process/process_metrics_freebsd.cc
-@@ -10,6 +10,9 @@
- 
- #include "base/sys_info.h"
- 
-+#include <unistd.h> /* getpagesize() */
-+#include <fcntl.h>  /* O_RDONLY */
-+
- namespace base {
- 
- ProcessMetrics::ProcessMetrics(ProcessHandle process)
-@@ -119,4 +122,23 @@
-   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
- }
- 
-+int GetNumberOfThreads(ProcessHandle process) {
-+  // Taken from FreeBSD top (usr.bin/top/machine.c)
-+
-+  kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
-+  if (kd == NULL)
-+    return 0;
-+
-+  struct kinfo_proc* pbase;
-+  int nproc;
-+  pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc);
-+  if (pbase == NULL)
-+    return 0;
-+
-+  if (kvm_close(kd) == -1)
-+    return 0;
-+
-+  return nproc;
-+}
-+
- }  // namespace base
diff --git a/www/chromium/files/patch-base__process__process_posix.cc b/www/chromium/files/patch-base__process__process_posix.cc
deleted file mode 100644
index fd60cc9a215e..000000000000
--- a/www/chromium/files/patch-base__process__process_posix.cc
+++ /dev/null
@@ -1,107 +0,0 @@
---- base/process/process_posix.cc.orig	2015-12-04 20:16:14.101666000 +0100
-+++ base/process/process_posix.cc	2015-12-04 20:32:34.362201000 +0100
-@@ -17,8 +17,18 @@
- #include <sys/event.h>
- #endif
- 
-+#if defined(OS_BSD)
-+#include <signal.h>
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#endif
-+
- namespace {
- 
-+const int kBackgroundPriority = 5;
-+const int kForegroundPriority = 0;
-+
- #if !defined(OS_NACL_NONSFI)
- 
- bool WaitpidWithTimeout(base::ProcessHandle handle,
-@@ -83,7 +93,7 @@
-   return ret_pid > 0;
- }
- 
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Using kqueue on Mac so that we can wait on non-child processes.
- // We can't use kqueues on child processes because we need to reap
- // our own children using wait.
-@@ -172,7 +182,7 @@
- 
-   return true;
- }
--#endif  // OS_MACOSX
-+#endif  // OS_MACOSX || OS_BSD
- 
- bool WaitForExitWithTimeoutImpl(base::ProcessHandle handle,
-                                 int* exit_code,
-@@ -180,13 +190,13 @@
-   base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
-   base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
-   if (parent_pid != our_pid) {
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
-     // On Mac we can wait on non child processes.
-     return WaitForSingleNonChildProcess(handle, timeout);
- #else
-     // Currently on Linux we can't handle non child processes.
-     NOTIMPLEMENTED();
--#endif  // OS_MACOSX
-+#endif  // OS_MACOSX || OS_BSD
-   }
- 
-   int status;
-@@ -255,12 +265,16 @@
-   return Process(handle);
- }
- 
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
- // static
- bool Process::CanBackgroundProcesses() {
-   return false;
- }
--#endif  // !defined(OS_LINUX)
-+#elif defined(OS_FREEBSD)
-+bool Process::CanBackgroundProcesses() {
-+  return true;
-+}
-+#endif  // !defined(OS_LINUX) && !defined(OS_FREEBSD)
- 
- bool Process::IsValid() const {
-   return process_ != kNullProcessHandle;
-@@ -360,15 +374,32 @@
- bool Process::IsProcessBackgrounded() const {
-   // See SetProcessBackgrounded().
-   DCHECK(IsValid());
-+#if defined(OS_FREEBSD)
-+  return true;
-+#else
-   return false;
-+#endif
- }
- 
- bool Process::SetProcessBackgrounded(bool value) {
-+#if !defined(OS_FREEBSD)
-   // Not implemented for POSIX systems other than Linux. With POSIX, if we were
-   // to lower the process priority we wouldn't be able to raise it back to its
-   // initial priority.
-   NOTIMPLEMENTED();
-   return false;
-+#else
-+  DCHECK(IsValid());
-+
-+  if (!CanBackgroundProcesses())
-+    return false;
-+
-+  int priority = value ? kBackgroundPriority : kForegroundPriority;
-+  int result   = setpriority(PRIO_PROCESS, process_, priority);
-+
-+  DPCHECK(result == 0);
-+  return result == 0;
-+#endif // !defined(OS_FREEBSD)
- }
- #endif  // !defined(OS_LINUX)
- 
diff --git a/www/chromium/files/patch-base__security_unittest.cc b/www/chromium/files/patch-base__security_unittest.cc
deleted file mode 100644
index 49d8b5c8db0c..000000000000
--- a/www/chromium/files/patch-base__security_unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/security_unittest.cc.orig	2014-10-10 09:15:29 UTC
-+++ base/security_unittest.cc
-@@ -160,7 +160,7 @@
- // FAILS_ is too clunky.
- void OverflowTestsSoftExpectTrue(bool overflow_detected) {
-   if (!overflow_detected) {
--#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_NACL)
-     // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't
-     // fail the test, but report.
-     printf("Platform has overflow: %s\n",
diff --git a/www/chromium/files/patch-base__strings__safe_sprintf.cc b/www/chromium/files/patch-base__strings__safe_sprintf.cc
deleted file mode 100644
index e455c7b8780c..000000000000
--- a/www/chromium/files/patch-base__strings__safe_sprintf.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- base/strings/safe_sprintf.cc.orig	2016-03-02 22:57:14.510959331 +0100
-+++ base/strings/safe_sprintf.cc	2016-03-02 23:00:42.911944805 +0100
-@@ -115,8 +115,11 @@
-         count_(0) {
- // MSVS2013's standard library doesn't mark max() as constexpr yet. cl.exe
- // supports static_cast but doesn't really implement constexpr yet so it doesn't
--// complain, but clang does.
--#if __cplusplus >= 201103 && !(defined(__clang__) && defined(OS_WIN))
-+// complain, but clang does. Older FreeBSD (<10) use libstdc++4.2, which
-+// doesn't mark numeric_limits::max() as constexp.
-+#if __cplusplus >= 201103 && \
-+	!(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) && \
-+	!(defined(__clang__) && defined(OS_WIN))
-     static_assert(kSSizeMaxConst ==
-                       static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
-                   "kSSizeMaxConst should be the max value of an ssize_t");
diff --git a/www/chromium/files/patch-base__sys_info_freebsd.cc b/www/chromium/files/patch-base__sys_info_freebsd.cc
deleted file mode 100644
index b78d09471ab1..000000000000
--- a/www/chromium/files/patch-base__sys_info_freebsd.cc
+++ /dev/null
@@ -1,67 +0,0 @@
---- base/sys_info_freebsd.cc.orig_orig	2016-03-20 18:19:10.466074029 +0100
-+++ base/sys_info_freebsd.cc	2016-03-20 18:22:51.449059006 +0100
-@@ -12,12 +12,34 @@
- 
- namespace base {
- 
-+int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
-+  int page_size, r = 0;
-+  unsigned pgfree, pginact, pgcache;
-+  size_t size = sizeof(page_size);
-+  size_t szpg = sizeof(pgfree);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
-+  if (r == -1) {
-+    NOTREACHED();
-+    return 0;
-+  }
-+  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
-+}
-+
- int64_t SysInfo::AmountOfPhysicalMemory() {
--  int pages, page_size;
-+  int pages, page_size, r = 0;
-   size_t size = sizeof(pages);
--  sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
--  sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
--  if (pages == -1 || page_size == -1) {
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
-+  if(r == 0)
-+    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
-+  if (r == -1) {
-     NOTREACHED();
-     return 0;
-   }
-@@ -35,4 +57,25 @@
-   return static_cast<uint64_t>(limit);
- }
- 
-+// static
-+std::string SysInfo::CPUModelName() {
-+  int mib[] = { CTL_HW, HW_MODEL };
-+  char name[256];
-+  size_t size = arraysize(name);
-+  if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0)
-+    return name;
-+  return std::string();
-+}
-+
-+int SysInfo::NumberOfProcessors() {
-+  int mib[] = { CTL_HW, HW_NCPU };
-+  int ncpu;
-+  size_t size = sizeof(ncpu);
-+  if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
-+    NOTREACHED();
-+    return 1;
-+  }
-+  return ncpu;
-+}
-+
- }  // namespace base
diff --git a/www/chromium/files/patch-base__sys_info_posix.cc b/www/chromium/files/patch-base__sys_info_posix.cc
deleted file mode 100644
index 2d94e6daf81b..000000000000
--- a/www/chromium/files/patch-base__sys_info_posix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/sys_info_posix.cc.orig	2014-10-10 08:54:09 UTC
-+++ base/sys_info_posix.cc
-@@ -75,7 +75,7 @@
- 
- namespace base {
- 
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
- int SysInfo::NumberOfProcessors() {
-   return g_lazy_number_of_processors.Get().value();
- }
diff --git a/www/chromium/files/patch-base__test__launcher__test_launcher.cc b/www/chromium/files/patch-base__test__launcher__test_launcher.cc
deleted file mode 100644
index b98d39b5999b..000000000000
--- a/www/chromium/files/patch-base__test__launcher__test_launcher.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- base/test/launcher/test_launcher.cc.orig	2014-10-10 09:15:29 UTC
-+++ base/test/launcher/test_launcher.cc
-@@ -45,6 +45,10 @@
- #include "base/win/windows_version.h"
- #endif
- 
-+#if defined(OS_FREEBSD)
-+#include <signal.h>
-+#endif
-+
- namespace base {
- 
- // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .
diff --git a/www/chromium/files/patch-base__threading__platform_thread_linux.cc b/www/chromium/files/patch-base__threading__platform_thread_linux.cc
deleted file mode 100644
index 81ff703fd8e7..000000000000
--- a/www/chromium/files/patch-base__threading__platform_thread_linux.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- base/threading/platform_thread_linux.cc.orig	2015-05-13 18:35:44.000000000 -0400
-+++ base/threading/platform_thread_linux.cc    2015-05-20 09:16:20.394597000 -0400
-@@ -15,7 +15,9 @@
- 
- #if !defined(OS_NACL)
- #include <pthread.h>
-+#if !defined(OS_BSD)
- #include <sys/prctl.h>
-+#endif
- #include <sys/types.h>
- #include <unistd.h>
- #endif
-@@ -74,7 +76,7 @@
-   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
-   tracked_objects::ThreadData::InitializeThreadContext(name);
- 
--#if !defined(OS_NACL)
-+#if !defined(OS_NACL) && !defined(OS_BSD)
-   // On linux we can get the thread names to show up in the debugger by setting
-   // the process name for the LWP.  We don't want to do this for the main
-   // thread because that would rename the process, causing tools like killall
diff --git a/www/chromium/files/patch-base__trace_event__process_memory_dump.cc b/www/chromium/files/patch-base__trace_event__process_memory_dump.cc
deleted file mode 100644
index 71882261e1d4..000000000000
--- a/www/chromium/files/patch-base__trace_event__process_memory_dump.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- base/trace_event/process_memory_dump.cc.orig	2016-03-05 15:21:43.755196423 +0100
-+++ base/trace_event/process_memory_dump.cc	2016-03-05 15:22:37.112362644 +0100
-@@ -66,7 +66,7 @@
-     int error_counter = 0;
-     // HANDLE_EINTR tries for 100 times. So following the same pattern.
-     do {
--      result = mincore(chunk_start, chunk_size, vec.data());
-+      result = mincore(chunk_start, chunk_size, (char *) vec.data());
-     } while (result == -1 && errno == EAGAIN && error_counter++ < 100);
-     if (result)
-       break;
diff --git a/www/chromium/files/patch-base__trace_event__process_memory_dump.h b/www/chromium/files/patch-base__trace_event__process_memory_dump.h
new file mode 100644
index 000000000000..e8d451f0804d
--- /dev/null
+++ b/www/chromium/files/patch-base__trace_event__process_memory_dump.h
@@ -0,0 +1,11 @@
+--- base/trace_event/process_memory_dump.h.orig	2016-05-25 15:00:55.000000000 -0400
++++ base/trace_event/process_memory_dump.h	2016-05-27 01:46:53.167565000 -0400
+@@ -23,7 +23,7 @@
+ 
+ // Define COUNT_RESIDENT_BYTES_SUPPORTED if platform supports counting of the
+ // resident memory.
+-#if (defined(OS_POSIX) && !defined(OS_NACL)) || defined(OS_WIN)
++#if (defined(OS_POSIX) && !defined(OS_NACL) && !defined(OS_BSD)) || defined(OS_WIN)
+ #define COUNT_RESIDENT_BYTES_SUPPORTED
+ #endif
+ 
diff --git a/www/chromium/files/patch-base_base.gyp b/www/chromium/files/patch-base_base.gyp
new file mode 100644
index 000000000000..b05b70e6a8f2
--- /dev/null
+++ b/www/chromium/files/patch-base_base.gyp
@@ -0,0 +1,23 @@
+--- base/base.gyp.orig	2016-05-11 19:02:11 UTC
++++ base/base.gyp
+@@ -113,7 +113,7 @@
+           ],
+           'link_settings': {
+             'libraries': [
+-              '-L/usr/local/lib -lexecinfo',
++              '-L/usr/local/lib -lexecinfo -lkvm',
+             ],
+           },
+         }],
+@@ -748,6 +748,11 @@
+             'sync_socket_unittest.cc',
+           ],
+         }],
++        ['OS == "freebsd"', {
++          'sources!': [
++            'debug/proc_maps_linux_unittest.cc',
++          ],
++        }],
+       ],  # target_conditions
+     },
+     {
diff --git a/www/chromium/files/patch-base_base.gypi b/www/chromium/files/patch-base_base.gypi
new file mode 100644
index 000000000000..d51b119ec915
--- /dev/null
+++ b/www/chromium/files/patch-base_base.gypi
@@ -0,0 +1,20 @@
+--- base/base.gypi.orig	2016-05-11 19:02:11 UTC
++++ base/base.gypi
+@@ -999,11 +999,16 @@
+               'process/memory_stubs.cc',
+             ],
+             'sources/': [
++              ['exclude', '^debug/proc_maps_linux\\.cc$'],
+               ['exclude', '^files/file_path_watcher_linux\\.cc$'],
+-              ['exclude', '^files/file_path_watcher_stub\\.cc$'],
+               ['exclude', '^files/file_util_linux\\.cc$'],
++              ['exclude', '^process/memory_linux\\.cc$'],
+               ['exclude', '^process/process_linux\\.cc$'],
+               ['exclude', '^sys_info_linux\\.cc$'],
++              ['exclude', '^process/process_iterator_linux\\.cc$'],
++              ['exclude', '^process/process_metrics_linux\\.cc$'],
++              ['exclude', '^files/file_path_watcher_fsevents\\.cc$'],
++              ['exclude', '^files/file_path_watcher_fsevents\\.h$'],
+             ],
+           }],
+           # Remove all unnecessary files for build_nexe.py to avoid exceeding
diff --git a/www/chromium/files/patch-base_debug_stack__trace__posix.cc b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
new file mode 100644
index 000000000000..8c058716798e
--- /dev/null
+++ b/www/chromium/files/patch-base_debug_stack__trace__posix.cc
@@ -0,0 +1,21 @@
+--- base/debug/stack_trace_posix.cc.orig	2016-05-11 19:02:11 UTC
++++ base/debug/stack_trace_posix.cc
+@@ -571,6 +571,10 @@ class SandboxSymbolizeHelper {
+   // for the modules that are loaded in the current process.
+   // Returns true on success.
+   bool CacheMemoryRegions() {
++#if defined(OS_FREEBSD)
++    // TODO (rene) avoid link error, implement something?
++    return false;
++#else
+     // Reads /proc/self/maps.
+     std::string contents;
+     if (!ReadProcMaps(&contents)) {
+@@ -586,6 +590,7 @@ class SandboxSymbolizeHelper {
+ 
+     is_initialized_ = true;
+     return true;
++#endif
+   }
+ 
+   // Opens all object files and caches their file descriptors.
diff --git a/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
new file mode 100644
index 000000000000..feb65dad5ce0
--- /dev/null
+++ b/www/chromium/files/patch-base_files_file__path__watcher__kqueue.h
@@ -0,0 +1,13 @@
+--- base/files/file_path_watcher_kqueue.h.orig	2016-03-25 13:04:44 UTC
++++ base/files/file_path_watcher_kqueue.h
+@@ -5,6 +5,10 @@
+ #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
+ #define BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
+ 
++#ifdef __FreeBSD__
++#include <sys/stdint.h>
++#include <sys/types.h>
++#endif
+ #include <sys/event.h>
+ #include <vector>
+ 
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
new file mode 100644
index 000000000000..d9065581122a
--- /dev/null
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -0,0 +1,13 @@
+--- base/i18n/icu_util.cc.orig	2016-05-21 17:18:09 UTC
++++ base/i18n/icu_util.cc
+@@ -36,10 +36,6 @@
+ #include "base/mac/foundation_util.h"
+ #endif
+ 
+-#define ICU_UTIL_DATA_FILE   0
+-#define ICU_UTIL_DATA_SHARED 1
+-#define ICU_UTIL_DATA_STATIC 2
+-
+ namespace base {
+ namespace i18n {
+ 
diff --git a/www/chromium/files/patch-base_i18n_icu__util.h b/www/chromium/files/patch-base_i18n_icu__util.h
new file mode 100644
index 000000000000..80df222449e7
--- /dev/null
+++ b/www/chromium/files/patch-base_i18n_icu__util.h
@@ -0,0 +1,13 @@
+--- base/i18n/icu_util.h.orig	2016-05-21 17:19:29 UTC
++++ base/i18n/icu_util.h
+@@ -11,6 +11,10 @@
+ #include "base/i18n/base_i18n_export.h"
+ #include "build/build_config.h"
+ 
++#define ICU_UTIL_DATA_FILE   0
++#define ICU_UTIL_DATA_SHARED 1
++#define ICU_UTIL_DATA_STATIC 2
++
+ namespace base {
+ namespace i18n {
+ 
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc
new file mode 100644
index 000000000000..4b8f548d8937
--- /dev/null
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux.cc
@@ -0,0 +1,44 @@
+--- base/posix/unix_domain_socket_linux.cc.orig	2016-03-25 13:04:44 UTC
++++ base/posix/unix_domain_socket_linux.cc
+@@ -23,6 +23,15 @@
+ 
+ namespace base {
+ 
++#if defined(__FreeBSD__)
++// Port over Linux ucred structure
++struct ucred {
++  pid_t pid; // process ID of the sending process
++  uid_t uid; // user ID of the sending process
++  gid_t gid; // group ID of the sending process
++};
++#endif
++
+ const size_t UnixDomainSocket::kMaxFileDescriptors = 16;
+ 
+ #if !defined(OS_NACL_NONSFI)
+@@ -41,7 +50,13 @@ static bool CreateSocketPair(ScopedFD* o
+ // static
+ bool UnixDomainSocket::EnableReceiveProcessId(int fd) {
+   const int enable = 1;
++#if defined(__FreeBSD__)
++  // XXX(rene) do this? :
++  // taken from dbus, Academic Free License 2.1 / GPL 2+
++  return 0; // fake OK
++#else
+   return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0;
++#endif
+ }
+ #endif  // !defined(OS_NACL_NONSFI)
+ 
+@@ -147,7 +162,11 @@ ssize_t UnixDomainSocket::RecvMsgWithFla
+       // The PNaCl toolchain for Non-SFI binary build does not support
+       // SCM_CREDENTIALS.
+       if (cmsg->cmsg_level == SOL_SOCKET &&
++#if defined(__FreeBSD__)
++        1) { // XXX(rene) carpet getting full ...
++#else
+           cmsg->cmsg_type == SCM_CREDENTIALS) {
++#endif
+         DCHECK_EQ(payload_len, sizeof(struct ucred));
+         DCHECK_EQ(pid, -1);
+         pid = reinterpret_cast<struct ucred*>(CMSG_DATA(cmsg))->pid;
diff --git a/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc b/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc
new file mode 100644
index 000000000000..b46ac6e34068
--- /dev/null
+++ b/www/chromium/files/patch-base_posix_unix__domain__socket__linux__unittest.cc
@@ -0,0 +1,18 @@
+--- base/posix/unix_domain_socket_linux_unittest.cc.orig	2016-03-25 13:04:44 UTC
++++ base/posix/unix_domain_socket_linux_unittest.cc
+@@ -2,10 +2,15 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include "build/build_config.h"
++
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#if defined(OS_BSD)
++#include <signal.h>
++#endif
+ #include <unistd.h>
+ 
+ #include "base/bind.h"
diff --git a/www/chromium/files/patch-base_process_internal__linux.h b/www/chromium/files/patch-base_process_internal__linux.h
new file mode 100644
index 000000000000..3a4500532372
--- /dev/null
+++ b/www/chromium/files/patch-base_process_internal__linux.h
@@ -0,0 +1,11 @@
+--- base/process/internal_linux.h.orig	2016-03-25 13:04:44 UTC
++++ base/process/internal_linux.h
+@@ -14,6 +14,8 @@
+ 
+ #include "base/files/file_path.h"
+ 
++#include <unistd.h> /* pid_t */
++
+ namespace base {
+ 
+ class Time;
diff --git a/www/chromium/files/patch-base_process_launch.cc b/www/chromium/files/patch-base_process_launch.cc
new file mode 100644
index 000000000000..08c4b147a429
--- /dev/null
+++ b/www/chromium/files/patch-base_process_launch.cc
@@ -0,0 +1,16 @@
+--- base/process/launch.cc.orig	2016-04-08 16:02:06 UTC
++++ base/process/launch.cc
+@@ -25,11 +25,11 @@ LaunchOptions::LaunchOptions()
+       fds_to_remap(NULL),
+       maximize_rlimits(NULL),
+       new_process_group(false)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+       , clone_flags(0)
+       , allow_new_privs(false)
+       , kill_on_parent_death(false)
+-#endif  // OS_LINUX
++#endif  // OS_LINUX || OS_FREEBSD
+ #if defined(OS_POSIX)
+       , pre_exec_delegate(NULL)
+ #endif  // OS_POSIX
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
new file mode 100644
index 000000000000..82eabb27b9e2
--- /dev/null
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -0,0 +1,20 @@
+--- base/process/launch.h.orig	2016-05-11 19:02:11 UTC
++++ base/process/launch.h
+@@ -135,7 +135,7 @@ struct BASE_EXPORT LaunchOptions {
+   // will be the same as its pid.
+   bool new_process_group;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   // If non-zero, start the process using clone(), using flags as provided.
+   // Unlike in clone, clone_flags may not contain a custom termination signal
+   // that is sent to the parent when the child dies. The termination signal will
+@@ -148,7 +148,7 @@ struct BASE_EXPORT LaunchOptions {
+ 
+   // Sets parent process death signal to SIGKILL.
+   bool kill_on_parent_death;
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_FREEBSD)
+ 
+ #if defined(OS_POSIX)
+   // If not empty, change to this directory before execing the new process.
diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc
new file mode 100644
index 000000000000..cbc41dd66ea7
--- /dev/null
+++ b/www/chromium/files/patch-base_process_memory.cc
@@ -0,0 +1,39 @@
+--- base/process/memory.cc.orig	2016-03-25 13:04:44 UTC
++++ base/process/memory.cc
+@@ -46,4 +46,36 @@ bool UncheckedCalloc(size_t num_items, s
+ 
+ #endif
+ 
++#if defined(OS_FREEBSD)
++
++#if defined(USE_TCMALLOC)
++// Used by UncheckedMalloc. If tcmalloc is linked to the executable
++// this will be replaced by a strong symbol that actually implement
++// the semantics and don't call new handler in case the allocation fails.
++extern "C" {
++      
++__attribute__((weak, visibility("default")))
++void* tc_malloc_skip_new_handler_weak(size_t size);
++
++void* tc_malloc_skip_new_handler_weak(size_t size) {
++  return malloc(size);
++}
++
++}
++#endif
++
++bool UncheckedMalloc(size_t size, void** result) {
++#if defined(MEMORY_TOOL_REPLACES_ALLOCATOR) || \ 
++    (!defined(LIBC_GLIBC) && !defined(USE_TCMALLOC))
++  *result = malloc(size);
++#elif defined(LIBC_GLIBC) && !defined(USE_TCMALLOC)
++  *result = __libc_malloc(size);
++#elif defined(USE_TCMALLOC)
++  *result = tc_malloc_skip_new_handler_weak(size);
++#endif
++  return *result != NULL;
++}
++
++#endif // defined(OS_FREEBSD)
++
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_process_memory__stubs.cc b/www/chromium/files/patch-base_process_memory__stubs.cc
new file mode 100644
index 000000000000..7cc065ce5e23
--- /dev/null
+++ b/www/chromium/files/patch-base_process_memory__stubs.cc
@@ -0,0 +1,18 @@
+--- base/process/memory_stubs.cc.orig	2016-03-25 13:04:44 UTC
++++ base/process/memory_stubs.cc
+@@ -27,6 +27,8 @@ bool AdjustOOMScore(ProcessId process, i
+ // their respective stdlib function since those functions will return null on a
+ // failure to allocate.
+ 
++#if !defined(OS_FREEBSD)
++// FreeBSD brings it's own implementation in memory.cc -- cmt
+ bool UncheckedMalloc(size_t size, void** result) {
+   *result = malloc(size);
+   return *result != nullptr;
+@@ -36,5 +38,6 @@ bool UncheckedCalloc(size_t num_items, s
+   *result = calloc(num_items, size);
+   return *result != nullptr;
+ }
++#endif
+ 
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_process_memory__unittest.cc b/www/chromium/files/patch-base_process_memory__unittest.cc
new file mode 100644
index 000000000000..853c19d9d518
--- /dev/null
+++ b/www/chromium/files/patch-base_process_memory__unittest.cc
@@ -0,0 +1,23 @@
+--- base/process/memory_unittest.cc.orig	2016-05-11 19:02:11 UTC
++++ base/process/memory_unittest.cc
+@@ -140,11 +140,11 @@ TEST(ProcessMemoryTest, MacTerminateOnHe
+ #endif  // defined(OS_MACOSX)
+ 
+ // Android doesn't implement set_new_handler, so we can't use the
+-// OutOfMemoryTest cases. OpenBSD does not support these tests either.
++// OutOfMemoryTest cases. OpenBSD and FreeBSD do not support these tests either.
+ // Don't test these on ASan/TSan/MSan configurations: only test the real
+ // allocator.
+ // Windows only supports these tests with the allocator shim in place.
+-#if !defined(OS_ANDROID) && !defined(OS_OPENBSD) &&   \
++#if !defined(OS_ANDROID) && !defined(OS_BSD) &&   \
+     !(defined(OS_WIN) && !defined(ALLOCATOR_SHIM)) && \
+     !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+ 
+@@ -474,5 +474,5 @@ TEST_F(OutOfMemoryHandledTest, Unchecked
+   EXPECT_TRUE(value_ == NULL);
+ }
+ #endif  // !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
+-#endif  // !defined(OS_ANDROID) && !defined(OS_OPENBSD) && !(defined(OS_WIN) &&
++#endif  // !defined(OS_ANDROID) && !defined(OS_BSD) && !(defined(OS_WIN) &&
+         // !defined(ALLOCATOR_SHIM)) && !defined(MEMORY_TOOL_REPLACES_ALLOCATOR)
diff --git a/www/chromium/files/patch-base_process_process__info__linux.cc b/www/chromium/files/patch-base_process_process__info__linux.cc
new file mode 100644
index 000000000000..308a4dbd108c
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__info__linux.cc
@@ -0,0 +1,39 @@
+--- base/process/process_info_linux.cc.orig	2016-03-25 13:04:44 UTC
++++ base/process/process_info_linux.cc
+@@ -11,10 +11,28 @@
+ #include "base/process/process_handle.h"
+ #include "base/time/time.h"
+ 
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ namespace base {
+ 
+ // static
+ const Time CurrentProcessInfo::CreationTime() {
++#if defined(__FreeBSD__) || defined(__DragonFly__)
++  int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, getpid() };
++  struct kinfo_proc proc;
++  size_t len = sizeof(struct kinfo_proc);
++  if (sysctl(mib, arraysize(mib), &proc, &len, NULL, 0) < 0)
++    return Time();
++#if defined(__DragonFly__)
++  return Time::FromTimeVal(proc.kp_start);
++#else
++  return Time::FromTimeVal(proc.ki_start);
++#endif
++#else
+   ProcessHandle pid = GetCurrentProcessHandle();
+   int64_t start_ticks =
+       internal::ReadProcStatsAndGetFieldAsInt64(pid, internal::VM_STARTTIME);
+@@ -23,6 +41,7 @@ const Time CurrentProcessInfo::CreationT
+   Time boot_time = internal::GetBootTime();
+   DCHECK(!boot_time.is_null());
+   return Time(boot_time + start_offset);
++#endif
+ }
+ 
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_process_process__iterator__freebsd.cc b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc
new file mode 100644
index 000000000000..59e1406d88e9
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__iterator__freebsd.cc
@@ -0,0 +1,36 @@
+--- base/process/process_iterator_freebsd.cc.orig	2016-03-25 13:04:44 UTC
++++ base/process/process_iterator_freebsd.cc
+@@ -10,6 +10,10 @@
+ #include <sys/sysctl.h>
+ #include <unistd.h>
+ 
++/* getuid() */
++#include <unistd.h>
++#include <sys/types.h>
++
+ #include "base/logging.h"
+ #include "base/macros.h"
+ #include "base/strings/string_split.h"
+@@ -72,19 +76,13 @@ bool ProcessIterator::CheckForNextProces
+   for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
+     size_t length;
+     struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
+-    int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.ki_pid };
++    int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_ARGS, kinfo.ki_pid };
+ 
+     if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB))
+       continue;
+ 
+-    length = 0;
+-    if (sysctl(mib, arraysize(mib), NULL, &length, NULL, 0) < 0) {
+-      LOG(ERROR) << "failed to figure out the buffer size for a command line";
+-      continue;
+-    }
+-
+-    data.resize(length);
+-
++    data.resize(ARG_MAX);
++    length = ARG_MAX;
+     if (sysctl(mib, arraysize(mib), &data[0], &length, NULL, 0) < 0) {
+       LOG(ERROR) << "failed to fetch a commandline";
+       continue;
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
new file mode 100644
index 000000000000..52e67b3a3a9f
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -0,0 +1,34 @@
+--- base/process/process_metrics.h.orig	2016-05-11 19:02:11 UTC
++++ base/process/process_metrics.h
+@@ -21,6 +21,13 @@
+ #include "base/values.h"
+ #include "build/build_config.h"
+ 
++#if defined(OS_BSD)
++#include <kvm.h>
++#include <sys/param.h>
++#include <sys/sysctl.h>
++#include <sys/user.h>
++#endif
++
+ #if defined(OS_MACOSX)
+ #include <mach/mach.h>
+ #include "base/process/port_provider_mac.h"
+@@ -314,13 +321,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys
+ // CPU-related ticks.  Returns -1 on parse error.
+ // Exposed for testing.
+ BASE_EXPORT int ParseProcStatCPU(const std::string& input);
++#endif
+ 
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD)
+ // Get the number of threads of |process| as available in /proc/<pid>/stat.
+ // This should be used with care as no synchronization with running threads is
+ // done. This is mostly useful to guarantee being single-threaded.
+ // Returns 0 on failure.
+ BASE_EXPORT int GetNumberOfThreads(ProcessHandle process);
++#endif
+ 
++#if defined(OS_LINUX) || defined(OS_ANDROID)
+ // /proc/self/exe refers to the current executable.
+ BASE_EXPORT extern const char kProcSelfExe[];
+ 
diff --git a/www/chromium/files/patch-base_process_process__metrics__freebsd.cc b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
new file mode 100644
index 000000000000..7a188d5f7eeb
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__metrics__freebsd.cc
@@ -0,0 +1,36 @@
+--- base/process/process_metrics_freebsd.cc.orig	2016-03-25 13:04:44 UTC
++++ base/process/process_metrics_freebsd.cc
+@@ -12,6 +12,9 @@
+ #include "base/macros.h"
+ #include "base/sys_info.h"
+ 
++#include <unistd.h> /* getpagesize() */
++#include <fcntl.h>  /* O_RDONLY */
++
+ namespace base {
+ 
+ ProcessMetrics::ProcessMetrics(ProcessHandle process)
+@@ -121,4 +124,23 @@ size_t GetSystemCommitCharge() {
+   return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
+ }
+ 
++int GetNumberOfThreads(ProcessHandle process) {
++  // Taken from FreeBSD top (usr.bin/top/machine.c)
++
++  kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open");
++  if (kd == NULL)
++    return 0;
++
++  struct kinfo_proc* pbase;
++  int nproc;
++  pbase = kvm_getprocs(kd, KERN_PROC_PID, process, &nproc);
++  if (pbase == NULL)
++    return 0;
++
++  if (kvm_close(kd) == -1)
++    return 0;
++
++  return nproc;
++}
++
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
new file mode 100644
index 000000000000..7c53754f5afd
--- /dev/null
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -0,0 +1,107 @@
+--- base/process/process_posix.cc.orig	2016-03-25 13:04:44 UTC
++++ base/process/process_posix.cc
+@@ -20,8 +20,18 @@
+ #include <sys/event.h>
+ #endif
+ 
++#if defined(OS_BSD)
++#include <signal.h>
++#include <sys/types.h>
++#include <sys/event.h>
++#include <sys/time.h>
++#endif
++
+ namespace {
+ 
++const int kBackgroundPriority = 5;
++const int kForegroundPriority = 0;
++
+ #if !defined(OS_NACL_NONSFI)
+ 
+ bool WaitpidWithTimeout(base::ProcessHandle handle,
+@@ -86,7 +96,7 @@ bool WaitpidWithTimeout(base::ProcessHan
+   return ret_pid > 0;
+ }
+ 
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ // Using kqueue on Mac so that we can wait on non-child processes.
+ // We can't use kqueues on child processes because we need to reap
+ // our own children using wait.
+@@ -175,7 +185,7 @@ static bool WaitForSingleNonChildProcess
+ 
+   return true;
+ }
+-#endif  // OS_MACOSX
++#endif  // OS_MACOSX || OS_BSD
+ 
+ bool WaitForExitWithTimeoutImpl(base::ProcessHandle handle,
+                                 int* exit_code,
+@@ -183,13 +193,13 @@ bool WaitForExitWithTimeoutImpl(base::Pr
+   base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
+   base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
+   if (parent_pid != our_pid) {
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+     // On Mac we can wait on non child processes.
+     return WaitForSingleNonChildProcess(handle, timeout);
+ #else
+     // Currently on Linux we can't handle non child processes.
+     NOTIMPLEMENTED();
+-#endif  // OS_MACOSX
++#endif  // OS_MACOSX || OS_BSD
+   }
+ 
+   int status;
+@@ -256,12 +266,16 @@ Process Process::DeprecatedGetProcessFro
+   return Process(handle);
+ }
+ 
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
+ // static
+ bool Process::CanBackgroundProcesses() {
+   return false;
+ }
+-#endif  // !defined(OS_LINUX)
++#elif defined(OS_FREEBSD)
++bool Process::CanBackgroundProcesses() {
++  return true;
++}
++#endif  // !defined(OS_LINUX) && !defined(OS_FREEBSD)
+ 
+ bool Process::IsValid() const {
+   return process_ != kNullProcessHandle;
+@@ -361,15 +375,32 @@ bool Process::WaitForExitWithTimeout(Tim
+ bool Process::IsProcessBackgrounded() const {
+   // See SetProcessBackgrounded().
+   DCHECK(IsValid());
++#if defined(OS_FREEBSD)
++  return true;
++#else
+   return false;
++#endif
+ }
+ 
+ bool Process::SetProcessBackgrounded(bool value) {
++#if !defined(OS_FREEBSD)
+   // Not implemented for POSIX systems other than Linux. With POSIX, if we were
+   // to lower the process priority we wouldn't be able to raise it back to its
+   // initial priority.
+   NOTIMPLEMENTED();
+   return false;
++#else
++  DCHECK(IsValid());
++
++  if (!CanBackgroundProcesses())
++    return false;
++
++  int priority = value ? kBackgroundPriority : kForegroundPriority;
++  int result   = setpriority(PRIO_PROCESS, process_, priority);
++
++  DPCHECK(result == 0);
++  return result == 0;
++#endif // !defined(OS_FREEBSD)
+ }
+ #endif  // !defined(OS_LINUX)
+ 
diff --git a/www/chromium/files/patch-base_security__unittest.cc b/www/chromium/files/patch-base_security__unittest.cc
new file mode 100644
index 000000000000..35a3259c8149
--- /dev/null
+++ b/www/chromium/files/patch-base_security__unittest.cc
@@ -0,0 +1,11 @@
+--- base/security_unittest.cc.orig	2016-05-11 19:02:11 UTC
++++ base/security_unittest.cc
+@@ -73,7 +73,7 @@ bool IsTcMallocBypassed() {
+ // FAILS_ is too clunky.
+ void OverflowTestsSoftExpectTrue(bool overflow_detected) {
+   if (!overflow_detected) {
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_NACL)
+     // Sadly, on Linux, Android, and OSX we don't have a good story yet. Don't
+     // fail the test, but report.
+     printf("Platform has overflow: %s\n",
diff --git a/www/chromium/files/patch-base_strings_safe__sprintf.cc b/www/chromium/files/patch-base_strings_safe__sprintf.cc
new file mode 100644
index 000000000000..3c429468d0e0
--- /dev/null
+++ b/www/chromium/files/patch-base_strings_safe__sprintf.cc
@@ -0,0 +1,16 @@
+--- base/strings/safe_sprintf.cc.orig	2016-03-25 13:04:44 UTC
++++ base/strings/safe_sprintf.cc
+@@ -115,8 +115,11 @@ class Buffer {
+         count_(0) {
+ // MSVS2013's standard library doesn't mark max() as constexpr yet. cl.exe
+ // supports static_cast but doesn't really implement constexpr yet so it doesn't
+-// complain, but clang does.
+-#if __cplusplus >= 201103 && !(defined(__clang__) && defined(OS_WIN))
++// complain, but clang does. Older FreeBSD (<10) use libstdc++4.2, which
++// doesn't mark numeric_limits::max() as constexp.
++#if __cplusplus >= 201103 && \
++	!(defined(OS_FREEBSD) && __FreeBSD_version > 1000054) && \
++	!(defined(__clang__) && defined(OS_WIN))
+     static_assert(kSSizeMaxConst ==
+                       static_cast<size_t>(std::numeric_limits<ssize_t>::max()),
+                   "kSSizeMaxConst should be the max value of an ssize_t");
diff --git a/www/chromium/files/patch-base_sys__info__freebsd.cc b/www/chromium/files/patch-base_sys__info__freebsd.cc
new file mode 100644
index 000000000000..e4f9ce805dfe
--- /dev/null
+++ b/www/chromium/files/patch-base_sys__info__freebsd.cc
@@ -0,0 +1,67 @@
+--- base/sys_info_freebsd.cc.orig	2016-03-25 13:04:44 UTC
++++ base/sys_info_freebsd.cc
+@@ -12,12 +12,34 @@
+ 
+ namespace base {
+ 
++int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
++  int page_size, r = 0;
++  unsigned pgfree, pginact, pgcache;
++  size_t size = sizeof(page_size);
++  size_t szpg = sizeof(pgfree);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_free_count", &pgfree, &szpg, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_inactive_count", &pginact, &szpg, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
++  if (r == -1) {
++    NOTREACHED();
++    return 0;
++  }
++  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
++}
++
+ int64_t SysInfo::AmountOfPhysicalMemory() {
+-  int pages, page_size;
++  int pages, page_size, r = 0;
+   size_t size = sizeof(pages);
+-  sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
+-  sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
+-  if (pages == -1 || page_size == -1) {
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0);
++  if(r == 0)
++    r = sysctlbyname("vm.stats.vm.v_page_size", &page_size, &size, NULL, 0);
++  if (r == -1) {
+     NOTREACHED();
+     return 0;
+   }
+@@ -35,4 +57,25 @@ uint64_t SysInfo::MaxSharedMemorySize() 
+   return static_cast<uint64_t>(limit);
+ }
+ 
++// static
++std::string SysInfo::CPUModelName() {
++  int mib[] = { CTL_HW, HW_MODEL };
++  char name[256];
++  size_t size = arraysize(name);
++  if (sysctl(mib, arraysize(mib), &name, &size, NULL, 0) == 0)
++    return name;
++  return std::string();
++}
++
++int SysInfo::NumberOfProcessors() {
++  int mib[] = { CTL_HW, HW_NCPU };
++  int ncpu;
++  size_t size = sizeof(ncpu);
++  if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) == -1) {
++    NOTREACHED();
++    return 1;
++  }
++  return ncpu;
++}
++
+ }  // namespace base
diff --git a/www/chromium/files/patch-base_sys__info__posix.cc b/www/chromium/files/patch-base_sys__info__posix.cc
new file mode 100644
index 000000000000..faf5ce3bd6bc
--- /dev/null
+++ b/www/chromium/files/patch-base_sys__info__posix.cc
@@ -0,0 +1,11 @@
+--- base/sys_info_posix.cc.orig	2016-03-25 13:04:44 UTC
++++ base/sys_info_posix.cc
+@@ -77,7 +77,7 @@ base::LazyInstance<
+ 
+ namespace base {
+ 
+-#if !defined(OS_OPENBSD)
++#if !defined(OS_OPENBSD) && !defined(OS_FREEBSD)
+ int SysInfo::NumberOfProcessors() {
+   return g_lazy_number_of_processors.Get().value();
+ }
diff --git a/www/chromium/files/patch-base_test_launcher_test__launcher.cc b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
new file mode 100644
index 000000000000..360864ca880f
--- /dev/null
+++ b/www/chromium/files/patch-base_test_launcher_test__launcher.cc
@@ -0,0 +1,13 @@
+--- base/test/launcher/test_launcher.cc.orig	2016-05-11 19:02:11 UTC
++++ base/test/launcher/test_launcher.cc
+@@ -52,6 +52,10 @@
+ #include "base/win/windows_version.h"
+ #endif
+ 
++#if defined(OS_FREEBSD)
++#include <signal.h>
++#endif
++
+ namespace base {
+ 
+ // See https://groups.google.com/a/chromium.org/d/msg/chromium-dev/nkdTP7sstSc/uT3FaE_sgkAJ .
diff --git a/www/chromium/files/patch-base_third__party_libevent_libevent.gyp b/www/chromium/files/patch-base_third__party_libevent_libevent.gyp
new file mode 100644
index 000000000000..a83381edf64f
--- /dev/null
+++ b/www/chromium/files/patch-base_third__party_libevent_libevent.gyp
@@ -0,0 +1,83 @@
+--- base/third_party/libevent/libevent.gyp.orig	2016-05-20 17:19:03 UTC
++++ base/third_party/libevent/libevent.gyp
+@@ -1,4 +1,4 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+@@ -6,59 +6,22 @@
+   'targets': [
+     {
+       'target_name': 'libevent',
+-      'product_name': 'event',
+-      'type': 'static_library',
++      'type': 'none',
+       'toolsets': ['host', 'target'],
+-      'sources': [
+-        'buffer.c',
+-        'evbuffer.c',
+-        'evdns.c',
+-        'event.c',
+-        'event_tagging.c',
+-        'evrpc.c',
+-        'evutil.c',
+-        'http.c',
+-        'log.c',
+-        'poll.c',
+-        'select.c',
+-        'signal.c',
+-        'strlcpy.c',
+-      ],
+-      'defines': [
+-        'HAVE_CONFIG_H',
+-      ],
+-      'include_dirs': [
+-        '../../..',
+-      ],
+-      'conditions': [
+-        # libevent has platform-specific implementation files.  Since its
+-        # native build uses autoconf, platform-specific config.h files are
+-        # provided and live in platform-specific directories.
+-        [ 'OS == "linux" or (OS == "android" and _toolset == "host")', {
+-          'sources': [ 'epoll.c' ],
+-          'include_dirs': [ 'linux' ],
+-          'link_settings': {
+-            'libraries': [
+-              # We need rt for clock_gettime().
+-              # TODO(port) Maybe on FreeBSD as well?
+-              '-lrt',
+-            ],
+-          },
+-        }],
+-        [ 'OS == "android" and _toolset == "target"', {
+-          # On android, clock_gettime() is in libc.so, so no need to link librt.
+-          'sources': [ 'epoll.c' ],
+-          'include_dirs': [ 'android' ],
+-        }],
+-        [ 'OS == "mac" or OS == "ios" or os_bsd==1', {
+-          'sources': [ 'kqueue.c' ],
+-          'include_dirs': [ 'mac' ]
+-        }],
+-        [ 'OS == "solaris"', {
+-          'sources': [ 'devpoll.c', 'evport.c' ],
+-          'include_dirs': [ 'solaris' ]
+-        }],
++      'variables': {
++        'headers_root_path': '.',
++        'header_filenames': [
++          'event.h',
++        ],
++      },
++      'includes': [
++        '../../../build/shim_headers.gypi',
+       ],
+-    },
++      'link_settings': {
++        'libraries': [
++          '-levent',
++        ],
++      },
++    }
+   ],
+ }
diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
new file mode 100644
index 000000000000..e74ecca9e181
--- /dev/null
+++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
@@ -0,0 +1,21 @@
+--- base/threading/platform_thread_linux.cc.orig	2016-04-08 16:02:06 UTC
++++ base/threading/platform_thread_linux.cc
+@@ -17,7 +17,9 @@
+ 
+ #if !defined(OS_NACL)
+ #include <pthread.h>
++#if !defined(OS_BSD)
+ #include <sys/prctl.h>
++#endif
+ #include <sys/types.h>
+ #include <unistd.h>
+ #endif
+@@ -70,7 +72,7 @@ void PlatformThread::SetName(const std::
+   ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
+   tracked_objects::ThreadData::InitializeThreadContext(name);
+ 
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+   // On linux we can get the thread names to show up in the debugger by setting
+   // the process name for the LWP.  We don't want to do this for the main
+   // thread because that would rename the process, causing tools like killall
diff --git a/www/chromium/files/patch-base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
new file mode 100644
index 000000000000..99d01c1e1cc8
--- /dev/null
+++ b/www/chromium/files/patch-base_threading_platform__thread__posix.cc
@@ -0,0 +1,11 @@
+--- base/threading/platform_thread_posix.cc.orig	2016-05-11 19:02:11 UTC
++++ base/threading/platform_thread_posix.cc
+@@ -53,7 +53,7 @@ void* ThreadFunc(void* params) {
+     if (!thread_params->joinable)
+       base::ThreadRestrictions::SetSingletonAllowed(false);
+ 
+-#if !defined(OS_NACL)
++#if !defined(OS_NACL) && !defined(OS_BSD)
+     // Threads on linux/android may inherit their priority from the thread
+     // where they were created. This explicitly sets the priority of all new
+     // threads.
diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
new file mode 100644
index 000000000000..1df8b2c829fb
--- /dev/null
+++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
@@ -0,0 +1,11 @@
+--- base/trace_event/process_memory_dump.cc.orig	2016-05-27 10:29:07.111255000 -0400
++++ base/trace_event/process_memory_dump.cc	2016-05-27 10:29:28.215964000 -0400
+@@ -83,7 +83,7 @@
+   const size_t kMaxChunkSize = 8 * 1024 * 1024;
+   size_t max_vec_size =
+       GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);
+-#if defined(OS_MACOSX) || defined(OS_IOS)
++#if defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_BSD)
+   std::unique_ptr<char[]> vec(new char[max_vec_size]);
+ #elif defined(OS_WIN)
+   std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
diff --git a/www/chromium/files/patch-build__common.gypi b/www/chromium/files/patch-build__common.gypi
deleted file mode 100644
index bd482f019fe6..000000000000
--- a/www/chromium/files/patch-build__common.gypi
+++ /dev/null
@@ -1,67 +0,0 @@
---- build/common.gypi.orig	2015-09-01 16:10:41.000000000 -0400
-+++ build/common.gypi	2015-09-03 09:38:09.528529000 -0400
-@@ -105,7 +105,7 @@
- 
-           'conditions': [
-             # Windows and Linux (including Chrome OS) use Aura and Ash.
--            ['OS=="win" or OS=="linux"', {
-+            ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-               'use_ash%': 1,
-               'use_aura%': 1,
-             }],
-@@ -729,6 +729,12 @@
-           'os_bsd%': 0,
-         }],
- 
-+        ['OS=="freebsd" or OS=="openbsd"', {
-+            'icu_use_data_file_flag%': 0,
-+        }, {
-+            'icu_use_data_file_flag%': 1,
-+        }],
-+
-         # NSS usage.
-         ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', {
-           'use_nss_certs%': 1,
-@@ -767,7 +773,7 @@
-         }],
- 
-         # DBus usage.
--        ['OS=="linux" and embedded==0', {
-+        ['(OS=="linux" or OS=="freebsd") and embedded==0', {
-           'use_dbus%': 1,
-         }, {
-           'use_dbus%': 0,
-@@ -1011,7 +1011,7 @@
-         }, {
-           'use_openmax_dl_fft%': 0,
-         }],
--        ['OS=="win" or OS=="linux"', {
-+        ['OS=="win" or OS=="linux" or OS=="freebsd"', {
-           'enable_mdns%' : 1,
-         }],
- 
-@@ -1263,6 +1269,10 @@
-     # able to turn it off for various reasons.
-     'linux_disable_pie%': 0,
- 
-+    # XXX(rene) More options, keep them?
-+    'os_ver%': 0,
-+    'use_system_libjpeg%': 0,
-+
-     # The release channel that this build targets. This is used to restrict
-     # channel-specific build options, like which installer packages to create.
-     # The default is 'all', which does no channel-specific filtering.
-@@ -4698,6 +4708,13 @@
-         'ldflags': [
-           '-Wl,--no-keep-memory',
-         ],
-+        'ldflags!': [
-+          '-ldl',
-+          '-pie'
-+        ],
-+        'libraries!': [
-+          '-ldl',
-+        ],
-       },
-     }],
-     # Android-specific options; note that most are set above with Linux.
diff --git a/www/chromium/files/patch-build__filename_rules.gypi b/www/chromium/files/patch-build__filename_rules.gypi
deleted file mode 100644
index 970978cfbdb1..000000000000
--- a/www/chromium/files/patch-build__filename_rules.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/filename_rules.gypi.orig	2014-10-10 08:54:09 UTC
-+++ build/filename_rules.gypi
-@@ -85,7 +85,7 @@
-     ['<(use_aura)==0 or OS!="win" or >(nacl_untrusted_build)==1', {
-       'sources/': [ ['exclude', '_aurawin\\.(h|cc)$'] ]
-     }],
--    ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', {
-+    ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', {
-       'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ]
-     }],
-     ['<(use_ash)==0 or >(nacl_untrusted_build)==1', {
diff --git a/www/chromium/files/patch-build__linux__system.gyp b/www/chromium/files/patch-build__linux__system.gyp
deleted file mode 100644
index 849e71b9255a..000000000000
--- a/www/chromium/files/patch-build__linux__system.gyp
+++ /dev/null
@@ -1,16 +0,0 @@
---- build/linux/system.gyp.orig	2014-10-10 08:54:09 UTC
-+++ build/linux/system.gyp
-@@ -866,6 +866,13 @@
-       'include_dirs': [
-         '../..',
-       ],
-+      'conditions' : [
-+        ['OS=="freebsd"', {
-+          'include_dirs': [
-+            '<(prefix_dir)/include',
-+          ],
-+        }],
-+      ],
-       'hard_dependency': 1,
-       'actions': [
-         {
diff --git a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp b/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
deleted file mode 100644
index 6e6a36a3bf10..000000000000
--- a/www/chromium/files/patch-build__linux__unbundle__libwebp.gyp
+++ /dev/null
@@ -1,17 +0,0 @@
---- build/linux/unbundle/libwebp.gyp.orig	2014-10-10 08:54:09 UTC
-+++ build/linux/unbundle/libwebp.gyp
-@@ -14,13 +14,7 @@
-       },
-       'link_settings': {
-         'libraries': [
--          # Check for presence of webpdemux library, use it if present.
--          '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
--          '--code "int main() { return 0; }" '
--          '--run-linker '
--          '--on-success "-lwebp -lwebpdemux" '
--          '--on-failure "-lwebp" '
--          '-- -lwebpdemux)',
-+          '-lwebp -lwebpdemux',
-         ],
-       },
-     }
diff --git a/www/chromium/files/patch-build_common.gypi b/www/chromium/files/patch-build_common.gypi
new file mode 100644
index 000000000000..d68046c5c9e8
--- /dev/null
+++ b/www/chromium/files/patch-build_common.gypi
@@ -0,0 +1,92 @@
+--- build/common.gypi.orig	2016-05-11 19:02:12 UTC
++++ build/common.gypi
+@@ -112,7 +112,7 @@
+ 
+           'conditions': [
+             # Windows and Linux use Aura, but not Ash.
+-            ['OS=="win" or OS=="linux"', {
++            ['OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+               'use_aura%': 1,
+             }],
+ 
+@@ -254,13 +254,13 @@
+           }],
+ 
+           # Enable HiDPI on Mac OS, Windows and Linux (including Chrome OS).
+-          ['OS=="mac" or OS=="win" or OS=="linux"', {
++          ['OS=="mac" or OS=="win" or OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
+             'enable_hidpi%': 1,
+           }],
+ 
+           # Enable Top Chrome Material Design on Chrome OS, Windows, and Linux,
+           # and Mac.
+-          ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac"', {
++          ['chromeos==1 or OS=="win" or OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
+             'enable_topchrome_md%': 1,
+           }],
+ 
+@@ -733,6 +733,12 @@
+           'os_bsd%': 0,
+         }],
+ 
++        ['OS=="freebsd" or OS=="openbsd"', {
++            'icu_use_data_file_flag%': 0,
++        }, {
++            'icu_use_data_file_flag%': 1,
++        }],
++
+         # NSS usage.
+         ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris")', {
+           'use_nss_certs%': 1,
+@@ -778,7 +784,7 @@
+         }],
+ 
+         # DBus usage.
+-        ['OS=="linux" and embedded==0', {
++        ['(OS=="linux" or OS=="freebsd") and embedded==0', {
+           'use_dbus%': 1,
+         }, {
+           'use_dbus%': 0,
+@@ -881,7 +887,7 @@
+ 
+         # Use GPU accelerated cross process image transport by default
+         # on linux builds with the Aura window manager
+-        ['use_aura==1 and OS=="linux"', {
++        ['use_aura==1 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', {
+           'ui_compositor_image_transport%': 1,
+         }, {
+           'ui_compositor_image_transport%': 0,
+@@ -1003,7 +1009,7 @@
+         }, {
+           'use_openmax_dl_fft%': 0,
+         }],
+-        ['OS=="win" or OS=="linux"', {
++        ['OS=="win" or OS=="linux" or OS=="freebsd"', {
+           'enable_mdns%' : 1,
+         }],
+ 
+@@ -1300,6 +1306,10 @@
+     # able to turn it off for various reasons.
+     'linux_disable_pie%': 0,
+ 
++    # XXX(rene) More options, keep them?
++    'os_ver%': 0,
++    'use_system_libjpeg%': 0,
++
+     # The release channel that this build targets. This is used to restrict
+     # channel-specific build options, like which installer packages to create.
+     # The default is 'all', which does no channel-specific filtering.
+@@ -4715,6 +4725,13 @@
+         'ldflags': [
+           '-Wl,--no-keep-memory',
+         ],
++        'ldflags!': [
++          '-ldl',
++          '-pie'
++        ],
++        'libraries!': [
++          '-ldl',
++        ],
+       },
+     }],
+     # Android-specific options; note that most are set above with Linux.
diff --git a/www/chromium/files/patch-build_filename__rules.gypi b/www/chromium/files/patch-build_filename__rules.gypi
new file mode 100644
index 000000000000..38cb26b1260a
--- /dev/null
+++ b/www/chromium/files/patch-build_filename__rules.gypi
@@ -0,0 +1,11 @@
+--- build/filename_rules.gypi.orig	2016-04-08 16:02:06 UTC
++++ build/filename_rules.gypi
+@@ -89,7 +89,7 @@
+                     ['exclude', '_ashwin\\.(h|cc)$']
+       ]
+     }],
+-    ['<(use_aura)==0 or OS!="linux" or >(nacl_untrusted_build)==1', {
++    ['<(use_aura)==0 or (OS!="linux" and OS!="openbsd" and OS!="freebsd") or >(nacl_untrusted_build)==1', {
+       'sources/': [ ['exclude', '_auralinux\\.(h|cc)$'] ]
+     }],
+     ['<(use_ozone)==0 or >(nacl_untrusted_build)==1', {
diff --git a/www/chromium/files/patch-build_linux_system.gyp b/www/chromium/files/patch-build_linux_system.gyp
new file mode 100644
index 000000000000..63a63b6a52e1
--- /dev/null
+++ b/www/chromium/files/patch-build_linux_system.gyp
@@ -0,0 +1,16 @@
+--- build/linux/system.gyp.orig	2016-05-11 19:02:12 UTC
++++ build/linux/system.gyp
+@@ -1051,6 +1051,13 @@
+       'include_dirs': [
+         '../..',
+       ],
++      'conditions' : [
++        ['OS=="freebsd"', {
++          'include_dirs': [
++            '<(prefix_dir)/include',
++          ],
++        }],
++      ],
+       'hard_dependency': 1,
+       'actions': [
+         {
diff --git a/www/chromium/files/patch-build_linux_unbundle_libwebp.gyp b/www/chromium/files/patch-build_linux_unbundle_libwebp.gyp
new file mode 100644
index 000000000000..2aead791fa3b
--- /dev/null
+++ b/www/chromium/files/patch-build_linux_unbundle_libwebp.gyp
@@ -0,0 +1,17 @@
+--- build/linux/unbundle/libwebp.gyp.orig	2016-03-25 13:04:44 UTC
++++ build/linux/unbundle/libwebp.gyp
+@@ -14,13 +14,7 @@
+       },
+       'link_settings': {
+         'libraries': [
+-          # Check for presence of webpdemux library, use it if present.
+-          '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
+-          '--code "int main() { return 0; }" '
+-          '--run-linker '
+-          '--on-success "-lwebp -lwebpdemux" '
+-          '--on-failure "-lwebp" '
+-          '-- -lwebpdemux)',
++          '-lwebp -lwebpdemux',
+         ],
+       },
+     }
diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc
deleted file mode 100644
index fa1ad0db7b82..000000000000
--- a/www/chromium/files/patch-cc__layers__layer_impl.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- cc/layers/layer_impl.cc.orig	2016-01-21 13:23:19.448767974 +0100
-+++ cc/layers/layer_impl.cc	2016-01-21 13:24:08.192764717 +0100
-@@ -1549,13 +1549,15 @@
-   scaled_scroll_bounds.SetSize(std::floor(scaled_scroll_bounds.width()),
-                                std::floor(scaled_scroll_bounds.height()));
- 
--  gfx::ScrollOffset max_offset(
-+  // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD
-+  // which also defines max_offset
-+  gfx::ScrollOffset _max_offset(
-       scaled_scroll_bounds.width() - scroll_clip_layer->bounds().width(),
-       scaled_scroll_bounds.height() - scroll_clip_layer->bounds().height());
-   // We need the final scroll offset to be in CSS coords.
--  max_offset.Scale(1 / scale_factor);
--  max_offset.SetToMax(gfx::ScrollOffset());
--  return max_offset;
-+  _max_offset.Scale(1 / scale_factor);
-+  _max_offset.SetToMax(gfx::ScrollOffset());
-+  return _max_offset;
- }
- 
- gfx::ScrollOffset LayerImpl::ClampScrollOffsetToLimits(
diff --git a/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc b/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc
deleted file mode 100644
index a7e89c9a8c69..000000000000
--- a/www/chromium/files/patch-cc__layers__scrollbar_layer_impl_base.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- cc/layers/scrollbar_layer_impl_base.cc.orig	2016-01-21 13:37:26.739709722 +0100
-+++ cc/layers/scrollbar_layer_impl_base.cc	2016-01-21 13:37:43.139708550 +0100
-@@ -183,8 +183,8 @@
-   int thumb_offset = TrackStart();
-   if (maximum > 0) {
-     float ratio = clamped_current_pos / maximum;
--    float max_offset = track_length - thumb_length;
--    thumb_offset += static_cast<int>(ratio * max_offset);
-+    float _max_offset = track_length - thumb_length;
-+    thumb_offset += static_cast<int>(ratio * _max_offset);
-   }
- 
-   float thumb_thickness_adjustment =
diff --git a/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
new file mode 100644
index 000000000000..4d1d6c5b8435
--- /dev/null
+++ b/www/chromium/files/patch-cc_layers_scrollbar__layer__impl__base.cc
@@ -0,0 +1,13 @@
+--- cc/layers/scrollbar_layer_impl_base.cc.orig	2016-03-25 13:04:44 UTC
++++ cc/layers/scrollbar_layer_impl_base.cc
+@@ -181,8 +181,8 @@ gfx::Rect ScrollbarLayerImplBase::Comput
+   int thumb_offset = TrackStart();
+   if (maximum > 0) {
+     float ratio = clamped_current_pos / maximum;
+-    float max_offset = track_length - thumb_length;
+-    thumb_offset += static_cast<int>(ratio * max_offset);
++    float _max_offset = track_length - thumb_length;
++    thumb_offset += static_cast<int>(ratio * _max_offset);
+   }
+ 
+   float thumb_thickness_adjustment =
diff --git a/www/chromium/files/patch-cc_trees_property__tree.cc b/www/chromium/files/patch-cc_trees_property__tree.cc
new file mode 100644
index 000000000000..bb65bc443f3b
--- /dev/null
+++ b/www/chromium/files/patch-cc_trees_property__tree.cc
@@ -0,0 +1,20 @@
+--- cc/trees/property_tree.cc.orig	2016-05-27 18:17:35.339678000 -0400
++++ cc/trees/property_tree.cc	2016-05-27 18:29:09.640334000 -0400
+@@ -1488,13 +1488,13 @@
+ 
+   gfx::Size clip_layer_bounds = scroll_clip_layer_bounds(scroll_node->id);
+ 
+-  gfx::ScrollOffset max_offset(
++  gfx::ScrollOffset _max_offset(
+       scaled_scroll_bounds.width() - clip_layer_bounds.width(),
+       scaled_scroll_bounds.height() - clip_layer_bounds.height());
+ 
+-  max_offset.Scale(1 / scale_factor);
+-  max_offset.SetToMax(gfx::ScrollOffset());
+-  return max_offset;
++  _max_offset.Scale(1 / scale_factor);
++  _max_offset.SetToMax(gfx::ScrollOffset());
++  return _max_offset;
+ }
+ 
+ gfx::Size ScrollTree::scroll_clip_layer_bounds(int scroll_node_id) const {
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc b/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
deleted file mode 100644
index 9bc45e350bad..000000000000
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- chrome/app/chrome_main_delegate.cc.orig	2015-10-21 18:00:37.000000000 -0400
-+++ chrome/app/chrome_main_delegate.cc	2015-10-23 12:25:02.965569000 -0400
-@@ -103,7 +103,7 @@
- #include "ui/base/x/x11_util.h"
- #endif
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "components/crash/content/app/breakpad_linux.h"
- #endif
- 
-@@ -508,7 +508,7 @@
-       std::string format_str =
-           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
-       if (format_str == "machine") {
--        format = diagnostics::DiagnosticsWriter::MACHINE;
-+        format = diagnostics::DiagnosticsWriter::THEMACHINE;
-       } else if (format_str == "log") {
-         format = diagnostics::DiagnosticsWriter::LOG;
-       } else {
-@@ -558,7 +558,7 @@
-       std::string format_str =
-           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
-       if (format_str == "machine") {
--        format = diagnostics::DiagnosticsWriter::MACHINE;
-+        format = diagnostics::DiagnosticsWriter::THEMACHINE;
-       } else if (format_str == "human") {
-         format = diagnostics::DiagnosticsWriter::HUMAN;
-       } else {
-@@ -641,7 +641,7 @@
-   std::string process_type =
-       command_line.GetSwitchValueASCII(switches::kProcessType);
- 
--#if defined(OS_POSIX)
-+#if defined(OS_POSIX) && !defined(OS_BSD)
-   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
- #endif
- 
-@@ -762,7 +762,7 @@
-   chrome::InitializePDF();
- #endif
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-   // Zygote needs to call InitCrashReporter() in RunZygote().
-   if (process_type != switches::kZygoteProcess) {
- #if defined(OS_ANDROID)
-@@ -776,7 +776,7 @@
-     breakpad::InitCrashReporter(process_type);
- #endif  // defined(OS_ANDROID)
-   }
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
-   // After all the platform Breakpads have been initialized, store the command
-   // line for crash reporting.
-@@ -886,7 +886,7 @@
- #endif
-   return process_type == switches::kRelauncherProcess;
- }
--#elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void ChromeMainDelegate::ZygoteStarting(
-     ScopedVector<content::ZygoteForkDelegate>* delegates) {
- #if !defined(DISABLE_NACL)
diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
deleted file mode 100644
index f13cce762932..000000000000
--- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/chrome_main_delegate.h.orig	2015-01-21 20:05:38 UTC
-+++ chrome/app/chrome_main_delegate.h
-@@ -37,7 +37,7 @@
-       const std::string& process_type) override;
-   bool ShouldSendMachPort(const std::string& process_type) override;
-   bool DelaySandboxInitialization(const std::string& process_type) override;
--#elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   void ZygoteStarting(
-       ScopedVector<content::ZygoteForkDelegate>* delegates) override;
-   void ZygoteForked() override;
diff --git a/www/chromium/files/patch-chrome__app__chromium_strings.grd b/www/chromium/files/patch-chrome__app__chromium_strings.grd
deleted file mode 100644
index 74fa0fa44cbf..000000000000
--- a/www/chromium/files/patch-chrome__app__chromium_strings.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/chromium_strings.grd.orig	2014-10-10 09:15:29 UTC
-+++ chrome/app/chromium_strings.grd
-@@ -1136,7 +1136,7 @@
-       </message>
- 
-       <!-- ProcessSingleton -->
--      <if expr="is_linux or is_macosx">
-+      <if expr="is_linux or is_macosx or is_bsd">
-         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
-           The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
-         </message>
diff --git a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd b/www/chromium/files/patch-chrome__app__resources__locale_settings.grd
deleted file mode 100644
index 52393447663a..000000000000
--- a/www/chromium/files/patch-chrome__app__resources__locale_settings.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/app/resources/locale_settings.grd.orig	2014-10-10 09:15:30 UTC
-+++ chrome/app/resources/locale_settings.grd
-@@ -264,7 +264,7 @@
-         55
-       </message>
- 
--      <if expr="is_win or is_linux or chromeos">
-+      <if expr="is_win or is_linux or chromeos or is_bsd">
-         <!-- The width of the ash/ChromeOS system tray menu in pixels. -->
-         <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id="true">
-           300
diff --git a/www/chromium/files/patch-chrome__browser__browser_resources.grd b/www/chromium/files/patch-chrome__browser__browser_resources.grd
deleted file mode 100644
index 521fc18023d1..000000000000
--- a/www/chromium/files/patch-chrome__browser__browser_resources.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/browser_resources.grd.orig	2015-11-18 08:21:01.846760000 -0500
-+++ chrome/browser/browser_resources.grd	2015-11-18 08:21:22.801803000 -0500
-@@ -251,7 +251,7 @@
-         <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
-         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
-       </if>
--      <if expr="desktop_linux or (is_android and enable_plugins)">
-+      <if expr="desktop_linux or (is_android and enable_plugins) or is_posix">
-         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
-       </if>
-       <if expr="is_android">
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
deleted file mode 100644
index 8dc72f13f43b..000000000000
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/chrome_browser_main.cc.orig	2015-10-13 15:04:31.000000000 -0400
-+++ chrome/browser/chrome_browser_main.cc	2015-10-15 13:19:01.371935000 -0400
-@@ -158,7 +158,7 @@
- #include "chrome/browser/feedback/feedback_profile_observer.h"
- #endif  // defined(OS_ANDROID)
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "chrome/browser/first_run/upgrade_util_linux.h"
- #include "chrome/browser/sxs_linux.h"
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-@@ -1013,7 +1013,7 @@
-   }
- #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_MACOSX)
-+#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
-   // Set the product channel for crash reports.
-   base::debug::SetCrashKeyValue(crash_keys::kChannel,
-                                 chrome::GetChannelString());
-@@ -1349,7 +1349,7 @@
-     return chrome::RESULT_CODE_MACHINE_LEVEL_INSTALL_EXISTS;
- #endif  // defined(OS_WIN)
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-   if (sxs_linux::ShouldMigrateUserDataDir())
-     return sxs_linux::MigrateUserDataDir();
- #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc b/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
deleted file mode 100644
index d92c539f93c1..000000000000
--- a/www/chromium/files/patch-chrome__browser__chrome_browser_main_posix.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- chrome/browser/chrome_browser_main_posix.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/chrome_browser_main_posix.cc
-@@ -270,6 +270,11 @@
-     g_pipe_pid = getpid();
-     g_shutdown_pipe_read_fd = pipefd[0];
-     g_shutdown_pipe_write_fd = pipefd[1];
-+#if defined(OS_FREEBSD)
-+    // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
-+    // we request the default pthread stack size by specifying 0 here.
-+    const size_t kShutdownDetectorThreadStackSize = 0;
-+#else
- #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
-     const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
- #else
-@@ -278,6 +283,7 @@
-     // size to avoid hitting the guard page.
-     const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
- #endif
-+#endif // OS_FREEBSD
-     // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
-     // if you change this, you'll probably need to change the suppression.
-     if (!base::PlatformThread::CreateNonJoinable(
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
deleted file mode 100644
index 95d34ef435d3..000000000000
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/browser/chrome_content_browser_client.cc.orig	2015-09-01 16:10:41.000000000 -0400
-+++ chrome/browser/chrome_content_browser_client.cc	2015-09-03 09:43:02.602298000 -0400
-@@ -444,7 +444,7 @@
-   return false;
- }
- 
--#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
-     const std::string& process_type) {
-   base::FilePath dumps_path;
-@@ -501,7 +501,7 @@
- 
-   return -1;
- }
--#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- void SetApplicationLocaleOnIOThread(const std::string& locale) {
-   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-@@ -1246,7 +1246,7 @@
-     command_line->AppendSwitchASCII(switches::kMetricsClientID,
-                                     client_info->client_id);
-   }
--#elif defined(OS_POSIX)
-+#elif defined(OS_POSIX) && !defined(OS_BSD)
-   if (breakpad::IsCrashReporterEnabled()) {
-     scoped_ptr<metrics::ClientInfo> client_info =
-         GoogleUpdateSettings::LoadMetricsClientInfo();
-@@ -2332,7 +2332,7 @@
-   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
-   DCHECK(!app_data_path.empty());
- }
--#elif defined(OS_POSIX) && !defined(OS_MACOSX)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
-     const base::CommandLine& command_line,
-     int child_process_id,
diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
deleted file mode 100644
index bbcc0353abed..000000000000
--- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/chrome_content_browser_client.h.orig	2015-09-03 09:44:27.080480000 -0400
-+++ chrome/browser/chrome_content_browser_client.h	2015-09-03 09:44:46.151235000 -0400
-@@ -253,7 +253,7 @@
-       int child_process_id,
-       content::FileDescriptorInfo* mappings,
-       std::map<int, base::MemoryMappedFile::Region>* regions) override;
--#elif defined(OS_POSIX) && !defined(OS_MACOSX)
-+#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-   void GetAdditionalMappedFilesForChildProcess(
-       const base::CommandLine& command_line,
-       int child_process_id,
diff --git a/www/chromium/files/patch-chrome__browser__defaults.cc b/www/chromium/files/patch-chrome__browser__defaults.cc
deleted file mode 100644
index 5123168b817b..000000000000
--- a/www/chromium/files/patch-chrome__browser__defaults.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/defaults.cc.orig	2015-04-14 18:31:21.000000000 -0400
-+++ chrome/browser/defaults.cc	2015-04-28 10:13:50.737855000 -0400
-@@ -41,7 +41,7 @@
- const bool kShowOtherBrowsersInAboutMemory = true;
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- const bool kScrollEventChangesTab = true;
- #else
- const bool kScrollEventChangesTab = false;
diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
deleted file mode 100644
index 7bede915590f..000000000000
--- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/diagnostics/diagnostics_writer.cc
-@@ -266,7 +266,7 @@
-       console_->SetColor(color);
-       console_->Write(base::ASCIIToUTF16(result));
-     }
--    if (format_ == MACHINE) {
-+    if (format_ == THEMACHINE) {
-       return WriteInfoLine(base::StringPrintf(
-           "%03d %s (%s)", outcome_code, id.c_str(), extra.c_str()));
-     } else {
diff --git a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h b/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
deleted file mode 100644
index 0bc044af772f..000000000000
--- a/www/chromium/files/patch-chrome__browser__diagnostics__diagnostics_writer.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/diagnostics/diagnostics_writer.h.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/diagnostics/diagnostics_writer.h
-@@ -18,7 +18,7 @@
-  public:
-   // The type of formatting done by this writer.
-   enum FormatType {
--    MACHINE,
-+    THEMACHINE,
-     LOG,
-     HUMAN
-   };
diff --git a/www/chromium/files/patch-chrome__browser__download__download_commands.cc b/www/chromium/files/patch-chrome__browser__download__download_commands.cc
deleted file mode 100644
index 3f1b7b9d2b5e..000000000000
--- a/www/chromium/files/patch-chrome__browser__download__download_commands.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/browser/download/download_commands.cc.orig	2015-07-16 07:26:09.936296000 -0400
-+++ chrome/browser/download/download_commands.cc	2015-07-16 07:27:35.099271000 -0400
-@@ -100,7 +100,7 @@
-              download_crx_util::IsExtensionDownload(*download_item_);
-     case ALWAYS_OPEN_TYPE:
- #if defined(OS_WIN) || defined(OS_LINUX) || \
--    (defined(OS_MACOSX) && !defined(OS_IOS))
-+    (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
-       if (CanOpenPdfInSystemViewer()) {
-         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
-             download_item_->GetBrowserContext());
-@@ -144,7 +144,7 @@
-       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
-           download_item_->GetBrowserContext());
- #if defined(OS_WIN) || defined(OS_LINUX) || \
--    (defined(OS_MACOSX) && !defined(OS_IOS))
-+    (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
-       if (CanOpenPdfInSystemViewer()) {
-         prefs->SetShouldOpenPdfInSystemReader(!is_checked);
-         DownloadItemModel(download_item_)
-@@ -218,7 +218,7 @@
-   return browser_displayer.browser();
- }
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- bool DownloadCommands::IsDownloadPdf() const {
-   base::FilePath path = download_item_->GetTargetFilePath();
-   return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
-@@ -235,7 +235,7 @@
-   return IsDownloadPdf() &&
-          (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
-                                           : true);
--#elif defined(OS_MACOSX) || defined(OS_LINUX)
-+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-   return IsDownloadPdf();
- #endif
- }
diff --git a/www/chromium/files/patch-chrome__browser__download__download_commands.h b/www/chromium/files/patch-chrome__browser__download__download_commands.h
deleted file mode 100644
index de9dd199f8ce..000000000000
--- a/www/chromium/files/patch-chrome__browser__download__download_commands.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- chrome/browser/download/download_commands.h.orig	2015-05-21 11:39:00.521239000 -0400
-+++ chrome/browser/download/download_commands.h	2015-05-21 11:39:40.015902000 -0400
-@@ -41,7 +41,8 @@
-   void ExecuteCommand(Command command);
- 
- #if defined(OS_WIN) || defined(OS_LINUX) || \
--    (defined(OS_MACOSX) && !defined(OS_IOS))
-+    defined(OS_BSD) || (defined(OS_MACOSX) && \
-+    !defined(OS_IOS))
-   bool IsDownloadPdf() const;
-   bool CanOpenPdfInSystemViewer() const;
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__download__download_prefs.cc b/www/chromium/files/patch-chrome__browser__download__download_prefs.cc
deleted file mode 100644
index d8f1fea02222..000000000000
--- a/www/chromium/files/patch-chrome__browser__download__download_prefs.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- chrome/browser/download/download_prefs.cc.orig	2015-07-15 16:29:57.000000000 -0400
-+++ chrome/browser/download/download_prefs.cc	2015-07-21 21:27:54.085299000 -0400
-@@ -51,7 +51,7 @@
- // Consider downloads 'dangerous' if they go to the home directory on Linux and
- // to the desktop on any platform.
- bool DownloadPathIsDangerous(const base::FilePath& download_path) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   base::FilePath home_dir = base::GetHomeDir();
-   if (download_path == home_dir) {
-     return true;
-@@ -131,7 +131,7 @@
-                  GetDefaultDownloadDirectoryForProfile()));
- #endif  // defined(OS_CHROMEOS)
- 
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   should_open_pdf_in_system_reader_ =
-       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
-@@ -208,7 +208,7 @@
-                                  default_download_path);
-   registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
-                                  default_download_path);
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
- #endif
-@@ -286,7 +286,7 @@
- }
- 
- bool DownloadPrefs::IsAutoOpenUsed() const {
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-       (defined(OS_MACOSX) && !defined(OS_IOS))
-   if (ShouldOpenPdfInSystemReader())
-     return true;
-@@ -301,7 +301,7 @@
-     return false;
-   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
-   extension.erase(0, 1);
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
-     return true;
-@@ -335,7 +335,7 @@
-   SaveAutoOpenState();
- }
- 
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
- void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
-   if (should_open_pdf_in_system_reader_ == should_open)
-@@ -357,7 +357,7 @@
- #endif
- 
- void DownloadPrefs::ResetAutoOpen() {
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   SetShouldOpenPdfInSystemReader(false);
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__download__download_prefs.h b/www/chromium/files/patch-chrome__browser__download__download_prefs.h
deleted file mode 100644
index 5c7dffe4cc1b..000000000000
--- a/www/chromium/files/patch-chrome__browser__download__download_prefs.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/download/download_prefs.h.orig	2015-01-24 21:53:47 UTC
-+++ chrome/browser/download/download_prefs.h
-@@ -73,7 +73,7 @@
-   // Disables auto-open based on file extension.
-   void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
- 
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   // Store the user preference to disk. If |should_open| is true, also disable
-   // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
-@@ -105,7 +105,7 @@
-                    AutoOpenCompareFunctor> AutoOpenSet;
-   AutoOpenSet auto_open_;
- 
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   bool should_open_pdf_in_system_reader_;
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__download__download_query.cc b/www/chromium/files/patch-chrome__browser__download__download_query.cc
deleted file mode 100644
index 541187ba4651..000000000000
--- a/www/chromium/files/patch-chrome__browser__download__download_query.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/download/download_query.cc.orig	2016-03-05 21:04:25.551612729 +0100
-+++ chrome/browser/download/download_query.cc	2016-03-05 21:05:14.895785377 +0100
-@@ -31,7 +31,11 @@
- #include "components/url_formatter/url_formatter.h"
- #include "content/public/browser/content_browser_client.h"
- #include "content/public/browser/download_item.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "url/gurl.h"
- 
- using content::DownloadDangerType;
diff --git a/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc b/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
deleted file mode 100644
index 6e9aa1a769cf..000000000000
--- a/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/download/download_shelf_context_menu.cc.orig	2015-05-13 18:23:03.000000000 -0400
-+++ chrome/browser/download/download_shelf_context_menu.cc	2015-05-20 09:21:47.075399000 -0400
-@@ -143,7 +143,7 @@
-                    : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
-           break;
-         }
--#elif defined(OS_MACOSX) || defined(OS_LINUX)
-+#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
-         if (can_open_pdf_in_system_viewer) {
-           id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
-           break;
diff --git a/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc b/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc
deleted file mode 100644
index 347019892976..000000000000
--- a/www/chromium/files/patch-chrome__browser__extensions__activity_log__activity_log.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/extensions/activity_log/activity_log.cc.orig	2016-03-05 21:02:01.319620815 +0100
-+++ chrome/browser/extensions/activity_log/activity_log.cc	2016-03-05 21:02:58.927616965 +0100
-@@ -39,7 +39,11 @@
- #include "extensions/browser/extensions_browser_client.h"
- #include "extensions/common/extension.h"
- #include "extensions/common/one_shot_event.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "url/gurl.h"
- 
- namespace constants = activity_log_constants;
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc b/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
deleted file mode 100644
index 34b578ae4fcf..000000000000
--- a/www/chromium/files/patch-chrome__browser__extensions__api__image_writer_private__image_writer_private_api.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
-@@ -167,10 +167,12 @@
- }
- 
- bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
-+#if !defined(OS_FREEBSD)
-   RemovableStorageProvider::GetAllDevices(
-     base::Bind(
-       &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady,
-       this));
-+#endif
-   return true;
- }
- 
diff --git a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc b/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
deleted file mode 100644
index a20c9972b979..000000000000
--- a/www/chromium/files/patch-chrome__browser__extensions__api__music_manager_private__device_id_linux.cc
+++ /dev/null
@@ -1,66 +0,0 @@
---- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2016-03-04 21:17:01.250966286 +0100
-+++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc	2016-03-04 21:17:09.082965156 +0100
-@@ -4,6 +4,10 @@
- 
- #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
- 
-+#if defined(OS_FREEBSD)
-+#include <sys/types.h>
-+#include <net/if_dl.h>
-+#endif
- #include <ifaddrs.h>
- #include <net/if.h>
- #include <stddef.h>
-@@ -102,11 +106,33 @@
-                         const char* prefixes[],
-                         size_t prefixes_count) {
-     const int MAC_LENGTH = 6;
-+#if defined(OS_FREEBSD)
-+    struct ifaddrs *ifap, *ifinfo;
-+#else
-     struct ifreq ifinfo;
-+#endif
- 
-     memset(&ifinfo, 0, sizeof(ifinfo));
--    strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
- 
-+#if defined(OS_FREEBSD)
-+    int result = getifaddrs(&ifap);
-+    if (result != 0)
-+      return true;
-+    result = 1; // no MAC found yet
-+    for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
-+      struct sockaddr* sa = ifinfo->ifa_addr;
-+      if (sa->sa_family == AF_LINK &&
-+        !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
-+        sizeof(ifinfo->ifa_name) - 1)) { 
-+          result = 0;
-+	  break;
-+      }
-+    }
-+
-+    char mac_address[6];
-+    strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
-+#else
-+    strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
-     int sd = socket(AF_INET, SOCK_DGRAM, 0);
-     int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
-     close(sd);
-@@ -116,11 +142,17 @@
- 
-     const char* mac_address =
-         static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
-+#endif
-     if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
-       return true;
- 
-+#if defined(OS_FREEBSD)
-+    if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
-+      return true;
-+#else
-     if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
-       return true;
-+#endif
- 
-     // Got one!
-     found_mac_address_ =
diff --git a/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc b/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc
deleted file mode 100644
index d547f38d6047..000000000000
--- a/www/chromium/files/patch-chrome__browser__extensions__window_open_apitest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/extensions/window_open_apitest.cc.orig	2015-01-14 08:44:00.000000000 +0100
-+++ chrome/browser/extensions/window_open_apitest.cc	2015-01-20 19:34:00.351092058 +0100
-@@ -263,7 +263,7 @@
-   ASSERT_TRUE(RunExtensionTest("window_open/panel")) << message_;
- }
- 
--#if defined(USE_ASH_PANELS) || defined(OS_LINUX)
-+#if defined(USE_ASH_PANELS) || defined(OS_LINUX) || defined(OS_FREEBSD)
- // On Ash, this currently fails because we're currently opening new panel
- // windows as popup windows instead.
- // We're also failing on Linux-aura due to the panel is not opened in the
diff --git a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc b/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
deleted file mode 100644
index c84898619c3b..000000000000
--- a/www/chromium/files/patch-chrome__browser__gpu__gl_string_manager.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/gpu/gl_string_manager.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/gpu/gl_string_manager.cc
-@@ -25,7 +25,7 @@
- 
- void GLStringManager::Initialize() {
-   // On MacOSX or Windows, preliminary GPUInfo is enough.
--#if defined(OS_LINUX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-   // We never remove this observer from GpuDataManager.
-   content::GpuDataManager::GetInstance()->AddObserver(this);
- 
diff --git a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc b/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
deleted file mode 100644
index 32d8db448678..000000000000
--- a/www/chromium/files/patch-chrome__browser__gpu__gpu_feature_checker.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/gpu/gpu_feature_checker.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/gpu/gpu_feature_checker.cc
-@@ -33,7 +33,7 @@
-   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
- 
-   bool finalized = true;
--#if defined(OS_LINUX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-   // On Windows and Mac, so far we can always make the final WebGL blacklisting
-   // decision based on partial GPU info; on Linux, we need to launch the GPU
-   // process to collect full GPU info and make the final decision.
diff --git a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc b/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
deleted file mode 100644
index 87c8072a23d9..000000000000
--- a/www/chromium/files/patch-chrome__browser__media__webrtc_log_uploader.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/media/webrtc_log_uploader.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/media/webrtc_log_uploader.cc
-@@ -233,6 +233,8 @@
-   const char product[] = "Chrome_Android";
- #elif defined(OS_CHROMEOS)
-   const char product[] = "Chrome_ChromeOS";
-+#elif defined(OS_FREEBSD)
-+  const char product[] = "Chrome_FreeBSD";
- #else
- #error Platform not supported.
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc b/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
deleted file mode 100644
index 79bdd012ec29..000000000000
--- a/www/chromium/files/patch-chrome__browser__media_galleries__fileapi__mtp_device_map_service.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2015-05-13 18:23:03.000000000 -0400
-+++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc    2015-05-20 09:48:32.273240000 -0400
-@@ -37,10 +37,12 @@
-     // Note that this initializes the delegate asynchronously, but since
-     // the delegate will only be used from the IO thread, it is guaranteed
-     // to be created before use of it expects it to be there.
-+#if !defined(OS_FREEBSD)
-     CreateMTPDeviceAsyncDelegate(
-         device_location, read_only,
-         base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
-                    base::Unretained(this), device_location, read_only));
-+#endif
-     mtp_device_usage_map_[key] = 0;
-   }
- 
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
deleted file mode 100644
index 68454711ea76..000000000000
--- a/www/chromium/files/patch-chrome__browser__media_galleries__media_file_system_registry.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/browser/media_galleries/media_file_system_registry.cc
-@@ -738,7 +738,10 @@
- // Constructor in 'private' section because depends on private class definition.
- MediaFileSystemRegistry::MediaFileSystemRegistry()
-     : file_system_context_(new MediaFileSystemContextImpl) {
--  StorageMonitor::GetInstance()->AddObserver(this);
-+  // This conditional is needed for shutdown.  Destructors
-+  // try to get the media file system registry.
-+  if (StorageMonitor::GetInstance())
-+    StorageMonitor::GetInstance()->AddObserver(this);
- }
- 
- MediaFileSystemRegistry::~MediaFileSystemRegistry() {
diff --git a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc b/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
deleted file mode 100644
index 59ceb375a39c..000000000000
--- a/www/chromium/files/patch-chrome__browser__media_galleries__media_folder_finder.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- chrome/browser/media_galleries/media_folder_finder.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/media_galleries/media_folder_finder.cc
-@@ -50,10 +50,10 @@
-   chrome::DIR_USER_APPLICATIONS,
-   chrome::DIR_USER_LIBRARY,
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   base::DIR_CACHE,
- #endif
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-   base::DIR_TEMP,
- #endif
- };
diff --git a/www/chromium/files/patch-chrome__browser__memory_details.cc b/www/chromium/files/patch-chrome__browser__memory_details.cc
deleted file mode 100644
index b9db31ecd43f..000000000000
--- a/www/chromium/files/patch-chrome__browser__memory_details.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/memory_details.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/memory_details.cc
-@@ -26,7 +26,7 @@
- #include "content/public/common/bindings_policy.h"
- #include "ui/base/l10n/l10n_util.h"
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- #include "content/public/browser/zygote_host_linux.h"
- #endif
- 
-@@ -247,7 +247,7 @@
- void MemoryDetails::CollectChildInfoOnUIThread() {
-   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   const pid_t zygote_pid = content::ZygoteHost::GetInstance()->GetPid();
- #endif
- 
-@@ -389,7 +389,7 @@
-       }
-     }
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-     if (process.pid == zygote_pid) {
-       process.process_type = content::PROCESS_TYPE_ZYGOTE;
-     }
diff --git a/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc b/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc
deleted file mode 100644
index 35a676bfa3a8..000000000000
--- a/www/chromium/files/patch-chrome__browser__metrics__chrome_browser_main_extra_parts_metrics.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -27,12 +27,14 @@
- 
- #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- #include <gnu/libc-version.h>
-+#endif
- 
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- #include "base/version.h"
- #if defined(USE_X11)
- #include "ui/base/x/x11_util.h"
- #endif
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif
- 
- #if defined(OS_WIN)
- #include "chrome/installer/util/google_update_settings.h"
diff --git a/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc b/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc
deleted file mode 100644
index 6eaadce2bff8..000000000000
--- a/www/chromium/files/patch-chrome__browser__notifications__message_center_notification_manager.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/notifications/message_center_notification_manager.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/browser/notifications/message_center_notification_manager.cc
-@@ -82,7 +82,7 @@
-   blockers_.push_back(new FullscreenNotificationBlocker(message_center));
- 
- #if defined(OS_WIN) || defined(OS_MACOSX) \
--  || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+  || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // On Windows, Linux and Mac, the notification manager owns the tray icon and
-   // views.Other platforms have global ownership and Create will return NULL.
-   tray_.reset(message_center::CreateMessageCenterTray());
diff --git a/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc b/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc
deleted file mode 100644
index b46c8366b694..000000000000
--- a/www/chromium/files/patch-chrome__browser__password_manager__chrome_password_manager_client.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2016-03-05 21:11:05.017583997 +0100
-+++ chrome/browser/password_manager/chrome_password_manager_client.cc	2016-03-05 21:11:24.785751124 +0100
-@@ -55,7 +55,11 @@
- #include "content/public/browser/web_contents.h"
- #include "google_apis/gaia/gaia_urls.h"
- #include "net/base/url_util.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
- #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
diff --git a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc b/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
deleted file mode 100644
index e0e9f46ef83a..000000000000
--- a/www/chromium/files/patch-chrome__browser__plugins__plugins_resource_service.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig	2014-10-10 08:54:10 UTC
-+++ chrome/browser/plugins/plugins_resource_service.cc
-@@ -33,7 +33,7 @@
-   std::string filename;
- #if defined(OS_WIN)
-   filename = "plugins_win.json";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   filename = "plugins_linux.json";
- #elif defined(OS_MACOSX)
-   filename = "plugins_mac.json";
diff --git a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc b/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
deleted file mode 100644
index 948a0230d463..000000000000
--- a/www/chromium/files/patch-chrome__browser__policy__policy_prefs_browsertest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/browser/policy/policy_prefs_browsertest.cc
-@@ -169,6 +169,8 @@
-     const std::string os("chromeos");
- #elif defined(OS_LINUX)
-     const std::string os("linux");
-+#elif defined(OS_FREEBSD)
-+    const std::string os("freebsd");
- #else
- #error "Unknown platform"
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc b/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc
deleted file mode 100644
index 78cfdc3a40c2..000000000000
--- a/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc
+++ /dev/null
@@ -1,34 +0,0 @@
---- chrome/browser/process_singleton_posix.cc.orig	2015-01-26 10:20:41 UTC
-+++ chrome/browser/process_singleton_posix.cc
-@@ -82,11 +82,11 @@
- #include "net/base/net_util.h"
- #include "ui/base/l10n/l10n_util.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/ui/process_singleton_dialog_linux.h"
- #endif
- 
--#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
- 
-@@ -322,7 +322,7 @@
-   if (g_disable_prompt)
-     return false;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
-       IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
-   return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -880,7 +880,7 @@
-     // The other process is shutting down, it's safe to start a new process.
-     return PROCESS_NONE;
-   } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
--#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-     // Likely NULL in unit tests.
-     views::LinuxUI* linux_ui = views::LinuxUI::instance();
-     if (linux_ui)
diff --git a/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc b/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
deleted file mode 100644
index cd22fafcef46..000000000000
--- a/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/browser/renderer_preferences_util.cc.orig	2015-05-13 18:35:45.000000000 -0400
-+++ chrome/browser/renderer_preferences_util.cc     2015-05-20 09:51:41.644579000 -0400
-@@ -13,7 +13,7 @@
- #include "content/public/common/renderer_preferences.h"
- #include "third_party/skia/include/core/SkColor.h"
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
- #include "ui/gfx/font_render_params.h"
- #endif
- 
-@@ -25,7 +25,7 @@
- #include "ui/views/controls/textfield/textfield.h"
- #endif
- 
--#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
- #include "chrome/browser/themes/theme_service.h"
- #include "chrome/browser/themes/theme_service_factory.h"
- #include "ui/views/linux_ui/linux_ui.h"
-@@ -84,7 +84,7 @@
-   prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
- #endif
- 
--#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
-   views::LinuxUI* linux_ui = views::LinuxUI::instance();
-   if (linux_ui) {
-     if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -106,7 +106,7 @@
-   }
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
-+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
-   CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
-       (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL)));
-   prefs->should_antialias_text = params.antialiasing;
diff --git a/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc b/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc
deleted file mode 100644
index f38027ec092f..000000000000
--- a/www/chromium/files/patch-chrome__browser__safe_browsing__incident_reporting__incident_handler_util.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2014-10-10 08:54:11 UTC
-+++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
-@@ -8,7 +8,12 @@
- 
- #include "base/hash.h"
- #include "base/logging.h"
-+//XXX(rene) needs shim headers?
-+#if defined(USE_SYSTEM_PROTOBUF)
-+#include <google/protobuf/message_lite.h>
-+#else
- #include "third_party/protobuf/src/google/protobuf/message_lite.h"
-+#endif
- 
- namespace safe_browsing {
- 
diff --git a/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc b/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc
deleted file mode 100644
index f7b6a922e2bc..000000000000
--- a/www/chromium/files/patch-chrome__browser__search__local_files_ntp_source.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- chrome/browser/search/local_files_ntp_source.cc.orig	2016-03-05 21:06:47.216601080 +0100
-+++ chrome/browser/search/local_files_ntp_source.cc	2016-03-05 21:07:16.040598823 +0100
-@@ -19,8 +19,13 @@
- #include "chrome/common/url_constants.h"
- #include "content/public/browser/browser_thread.h"
- #include "content/public/browser/url_data_source.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#include <re2/stringpiece.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
- #include "third_party/re2/src/re2/stringpiece.h"
-+#endif
- 
- namespace {
- 
diff --git a/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc b/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc
deleted file mode 100644
index 8e46e55c28f9..000000000000
--- a/www/chromium/files/patch-chrome__browser__sync__chrome_sync_client.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig	2016-03-04 21:50:06.513829549 +0100
-+++ chrome/browser/sync/chrome_sync_client.cc	2016-03-04 21:50:19.352828601 +0100
-@@ -572,7 +572,7 @@
-   }
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
-   // Dictionary sync is enabled by default.
-   if (!disabled_types.Has(syncer::DICTIONARY)) {
-     sync_service->RegisterDataTypeController(new UIDataTypeController(
diff --git a/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc b/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc
deleted file mode 100644
index c981b790f0f6..000000000000
--- a/www/chromium/files/patch-chrome__browser__tracing__crash_service_uploader.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/tracing/crash_service_uploader.cc.orig	2015-04-20 19:15:53.000000000 +0200
-+++ chrome/browser/tracing/crash_service_uploader.cc	2015-04-20 19:16:21.000000000 +0200
-@@ -127,6 +127,8 @@
-   const char product[] = "Chrome_Android";
- #elif defined(OS_CHROMEOS)
-   const char product[] = "Chrome_ChromeOS";
-+#elif defined(OS_FREEBSD)
-+  const char product[] = "Chrome_FreeBSD";
- #else
- #error Platform not supported.
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc b/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
deleted file mode 100644
index 8568e3f047eb..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig	 2015-05-13 18:23:04.000000000 -0400
-+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc  2015-05-21 11:12:51.226717000 -0400
-@@ -19,7 +19,7 @@
- #include "ui/gfx/screen.h"
- #include "ui/views/widget/native_widget_aura.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "base/prefs/pref_service.h"
- #include "chrome/browser/profiles/profile.h"
- #include "chrome/common/pref_names.h"
-@@ -137,7 +137,7 @@
- }
- 
- void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Now that we have some minimal ui initialized, check to see if we're
-   // running as root and bail if we are.
-   DetectRunningAsRoot();
-@@ -151,7 +151,7 @@
-   // after the metrics service is deleted.
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() {
-   if (getuid() == 0) {
-     const base::CommandLine& command_line =
diff --git a/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h b/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h
deleted file mode 100644
index ca430f98618c..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h.orig	2015-01-26 10:33:29
-+++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
-@@ -25,7 +25,7 @@
-   void PostMainMessageLoopRun() override;
- 
-  private:
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // On the Linux desktop, we want to prevent the user from logging in as root,
-   // so that we don't destroy the profile.
-   void DetectRunningAsRoot();
diff --git a/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc b/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc
deleted file mode 100644
index d780be9b25aa..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/browser/ui/browser_command_controller.cc.orig	2015-01-21 20:28:15 UTC
-+++ chrome/browser/ui/browser_command_controller.cc
-@@ -69,7 +69,7 @@
- #include "chrome/browser/ui/browser_commands_chromeos.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
- #endif
- 
-@@ -281,7 +281,7 @@
-   if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
-     return true;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // If this key was registered by the user as a content editing hotkey, then
-   // it is not reserved.
-   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -469,7 +469,7 @@
-       break;
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-     case IDC_USE_SYSTEM_TITLE_BAR: {
-       PrefService* prefs = browser_->profile()->GetPrefs();
-       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
-@@ -898,7 +898,7 @@
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
-   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
- #endif
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true);
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc b/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc
deleted file mode 100644
index 8c2ada45ddf8..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__browser_view_prefs.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig	2014-10-10 08:54:11 UTC
-+++ chrome/browser/ui/browser_view_prefs.cc
-@@ -9,7 +9,7 @@
- #include "chrome/common/pref_names.h"
- #include "components/pref_registry/pref_registry_syncable.h"
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
- #include "ui/base/x/x11_util.h"
- #endif
- 
-@@ -42,7 +42,7 @@
- void RegisterBrowserViewProfilePrefs(
-     user_prefs::PrefRegistrySyncable* registry) {
-   bool custom_frame_default = false;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
-   custom_frame_default = ui::GetCustomFramePrefDefault();
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc b/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc
deleted file mode 100644
index 2f9e7e7fee3c..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__exclusive_access__exclusive_access_bubble.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2015-04-14 18:31:21.000000000 -0400
-+++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc	2015-04-28 10:00:47.585758000 -0400
-@@ -18,7 +18,7 @@
- 
- // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
- // here.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const int ExclusiveAccessBubble::kPaddingPx = 8;
- #else
- const int ExclusiveAccessBubble::kPaddingPx = 15;
diff --git a/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc b/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc
deleted file mode 100644
index a68dea7918ca..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__panels__panel_manager.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/panels/panel_manager.cc.orig	2015-01-14 08:44:01.000000000 +0100
-+++ chrome/browser/ui/panels/panel_manager.cc	2015-01-20 19:36:06.959753456 +0100
-@@ -138,7 +138,7 @@
- // static
- bool PanelManager::IsPanelStackingEnabled() {
-   // Stacked panel mode is not supported in linux-aura.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   return false;
- #else
-   return true;
diff --git a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
deleted file mode 100644
index c91b5a3519ab..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2015-01-21 20:28:16 UTC
-+++ chrome/browser/ui/startup/startup_browser_creator.cc
-@@ -79,7 +79,7 @@
- #include "components/user_manager/user_manager.h"
- #endif
- 
--#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
-+#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD))
- #include "ui/events/devices/x11/touch_factory_x11.h"
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc b/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc
deleted file mode 100644
index 428833b13c70..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__toolbar__app_menu_model.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2016-01-21 14:37:58.792459231 +0100
-+++ chrome/browser/ui/toolbar/app_menu_model.cc	2016-01-21 14:39:05.304456038 +0100
-@@ -779,7 +779,7 @@
-     case IDC_UPGRADE_DIALOG:
-       return browser_defaults::kShowUpgradeMenuItem &&
-           UpgradeDetector::GetInstance()->notify_upgrade();
--#if !defined(OS_LINUX) || defined(USE_AURA)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
-     case IDC_BOOKMARK_PAGE:
-       return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
-     case IDC_BOOKMARK_ALL_TABS:
diff --git a/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc b/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
deleted file mode 100644
index c6f6dd08f3b9..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2015-01-26 10:43:43 UTC
-+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -266,7 +266,7 @@
-   //     synchronous on desktop Linux, so use that.
-   // - Ash
-   //     Releasing capture on Ash cancels gestures so avoid it.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   can_release_capture_ = false;
- #else
-   can_release_capture_ =
-@@ -621,7 +621,7 @@
-     // that to effect the position of any windows.
-     SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
- 
--#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
-     // EndMoveLoop is going to snap the window back to its original location.
-     // Hide it so users don't see this. Hiding a window in Linux aura causes
-     // it to lose capture so skip it.
-@@ -1806,7 +1806,7 @@
-     if (dragged_window)
-       exclude.insert(dragged_window);
-   }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   // Exclude windows which are pending deletion via Browser::TabStripEmpty().
-   // These windows can be returned in the Linux Aura port because the browser
-   // window which was used for dragging is not hidden once all of its tabs are
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc b/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc
deleted file mode 100644
index e38656f170d2..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__apps__chrome_native_app_window_views_aura.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig    2015-05-20 09:55:54.547216000 -0400
-+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc	2015-05-20 09:56:51.726483000 -0400
-@@ -34,7 +34,7 @@
- #include "ash/shell_window_ids.h"
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/shell_integration_linux.h"
- #endif
- 
-@@ -122,7 +122,7 @@
-     const AppWindow::CreateParams& create_params,
-     views::Widget::InitParams* init_params,
-     views::Widget* widget) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
-       app_window()->extension_id());
-   // Set up a custom WM_CLASS for app windows. This allows task switchers in
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc
deleted file mode 100644
index 00fd0867c6b2..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2014-10-10 08:54:11 UTC
-+++ chrome/browser/ui/views/chrome_views_delegate.cc
-@@ -45,7 +45,7 @@
- #include "ui/views/widget/native_widget_aura.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
- 
-@@ -235,7 +235,7 @@
-   return chrome::IsNativeViewInAsh(window);
- }
- 
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
-   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-   return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
-@@ -374,7 +374,7 @@
- #endif
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
- bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
-   // On Ubuntu Unity, the system always provides a title bar for maximized
-   // windows.
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
deleted file mode 100644
index aa2ed435aff1..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig	2015-07-15 16:29:58.000000000 -0400
-+++ chrome/browser/ui/views/chrome_views_delegate.h	2015-07-21 21:54:27.828544000 -0400
-@@ -31,7 +31,7 @@
-   HICON GetDefaultWindowIcon() const override;
-   HICON GetSmallWindowIcon() const override;
-   bool IsWindowInMetro(gfx::NativeWindow window) const override;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   gfx::ImageSkia* GetDefaultWindowIcon() const override;
- #endif
- 
-@@ -44,7 +44,7 @@
-   void OnBeforeWidgetInit(
-       views::Widget::InitParams* params,
-       views::internal::NativeWidgetDelegate* delegate) override;
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   bool WindowManagerProvidesTitleBar(bool maximized) override;
- #endif
-   ui::ContextFactory* GetContextFactory() override;
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc b/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
deleted file mode 100644
index 8e9fc1073cc2..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__first_run_dialog.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig	2014-10-10 08:54:11 UTC
-+++ chrome/browser/ui/views/first_run_dialog.cc
-@@ -118,12 +118,16 @@
- bool FirstRunDialog::Accept() {
-   GetWidget()->Hide();
- 
-+#if !defined(OS_BSD)
-   if (report_crashes_ && report_crashes_->checked()) {
-     if (GoogleUpdateSettings::SetCollectStatsConsent(true))
-       breakpad::InitCrashReporter(std::string());
--  } else {
-+  } else
-+#else
-+  {
-     GoogleUpdateSettings::SetCollectStatsConsent(false);
-   }
-+#endif
- 
-   if (make_default_ && make_default_->checked())
-     ShellIntegration::SetAsDefaultBrowser();
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
deleted file mode 100644
index 3a0b2aec1fe1..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__browser_frame.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig	2015-04-18 23:43:03.000000000 +0200
-+++ chrome/browser/ui/views/frame/browser_frame.cc	2015-04-18 23:46:33.000000000 +0200
-@@ -33,7 +33,7 @@
- #include "ash/shell.h"
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
- #endif
- 
-@@ -82,7 +82,7 @@
-     non_client_view()->set_context_menu_controller(this);
-   }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
- #endif
- }
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
deleted file mode 100644
index 79800febcbb7..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2016-01-21 15:44:16.454185203 +0100
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc	2016-01-21 15:50:24.719159940 +0100
-@@ -55,7 +55,7 @@
- #include "chrome/browser/ui/views/profiles/supervised_user_avatar_label.h"
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/views/controls/menu/menu_runner.h"
- #endif
- 
-@@ -336,7 +336,7 @@
- 
- void OpaqueBrowserFrameView::OnMenuButtonClicked(views::View* source,
-                                                  const gfx::Point& point) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
-                                 views::MenuRunner::HAS_MNEMONICS);
-   ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc
deleted file mode 100644
index d8e3a008fead..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_layout.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
-@@ -82,7 +82,7 @@
- // is no avatar icon.
- const int kTabStripIndent = -6;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- // Default extra space between the top of the frame and the top of the window
- // caption buttons.
- const int kExtraCaption = 2;
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc
deleted file mode 100644
index 821a567155d8..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__opaque_browser_frame_view_platform_specific.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2015-04-30 16:57:02.000000000 +0200
-+++ ./chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc	2015-04-30 16:56:00.000000000 +0200
-@@ -10,7 +10,7 @@
-   return false;
- }
- 
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
- 
- // static
- OpaqueBrowserFrameViewPlatformSpecific*
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc b/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc
deleted file mode 100644
index 00a5685a593d..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__frame__system_menu_model_builder.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2015-04-14 18:18:50.000000000 -0400
-+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc	2015-04-28 09:50:22.925763000 -0400
-@@ -65,7 +65,7 @@
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-   }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   model->AddSeparator(ui::NORMAL_SEPARATOR);
-   model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
-                                   IDS_SHOW_WINDOW_DECORATIONS_MENU);
-@@ -103,7 +103,7 @@
-     model->AddSeparator(ui::NORMAL_SEPARATOR);
-     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
-   }
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   model->AddSeparator(ui::NORMAL_SEPARATOR);
-   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc
deleted file mode 100644
index 611c6b7f2ae4..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__message_center__message_center_frame_view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig	2015-04-28 09:47:57.763176000 -0400
-+++ chrome/browser/ui/views/message_center/message_center_frame_view.cc	2015-04-28 09:48:19.225959000 -0400
-@@ -13,7 +13,7 @@
- namespace message_center {
- 
- MessageCenterFrameView::MessageCenterFrameView() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   const int kBorderWidth = 1;
-   SetBorder(views::Border::CreateSolidBorder(
-       kBorderWidth, message_center::kMessageCenterBorderColor));
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc b/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc
deleted file mode 100644
index 9d5b545f1c31..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__panels__panel_frame_view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/panels/panel_frame_view.cc.orig	2015-04-28 09:42:09.840501000 -0400
-+++ chrome/browser/ui/views/panels/panel_frame_view.cc	2015-04-28 09:42:33.023800000 -0400
-@@ -581,7 +581,7 @@
- }
- 
- bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Converting the mouse location to screen coordinates returns an incorrect
-   // location while the panel is moving. See crbug.com/353393 for more details.
-   // TODO(pkotwicz): Fix conversion to screen coordinates
diff --git a/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc b/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc
deleted file mode 100644
index bceee1b62cfa..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__views__tabs__tab_strip.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -281,7 +281,7 @@
-     : views::ImageButton(listener),
-       tab_strip_(tab_strip),
-       destroyed_(NULL) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   set_triggerable_event_flags(triggerable_event_flags() |
-                               ui::EF_MIDDLE_MOUSE_BUTTON);
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc b/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
deleted file mode 100644
index af0984d787d8..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__webui__about_ui.cc
+++ /dev/null
@@ -1,54 +0,0 @@
---- chrome/browser/ui/webui/about_ui.cc.orig	2015-04-18 23:56:37.000000000 +0200
-+++ chrome/browser/ui/webui/about_ui.cc	2015-04-20 19:06:22.000000000 +0200
-@@ -64,7 +64,7 @@
- #include "chrome/browser/ui/webui/theme_source.h"
- #endif
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "content/public/browser/zygote_host_linux.h"
- #include "content/public/common/sandbox_linux.h"
- #endif
-@@ -659,7 +659,7 @@
-   }
- }
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- std::string AboutLinuxProxyConfig() {
-   std::string data;
-   AppendHeader(&data, 0,
-@@ -675,6 +675,7 @@
-   return data;
- }
- 
-+#if !defined(OS_BSD)
- void AboutSandboxRow(std::string* data, int name_id, bool good) {
-   data->append("<tr><td>");
-   data->append(l10n_util::GetStringUTF8(name_id));
-@@ -742,6 +743,7 @@
-   return data;
- }
- #endif
-+#endif
- 
- // AboutMemoryHandler ----------------------------------------------------------
- 
-@@ -914,7 +916,7 @@
-   } else if (source_name_ == chrome::kChromeUIDNSHost) {
-     AboutDnsHandler::Start(profile(), callback);
-     return;
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
-     response = AboutLinuxProxyConfig();
- #endif
-@@ -928,7 +930,7 @@
-     ChromeOSCreditsHandler::Start(path, callback);
-     return;
- #endif
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_FREEBSD)
-   } else if (source_name_ == chrome::kChromeUISandboxHost) {
-     response = AboutSandbox();
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
deleted file mode 100644
index 2ab84bff90aa..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2015-10-14 16:37:51.456856000 +0200
-+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc	2015-10-14 16:38:21.306588000 +0200
-@@ -273,7 +273,7 @@
- #if !defined(OS_ANDROID)
-           || url.host() == chrome::kChromeUITermsHost
- #endif
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-           || url.host() == chrome::kChromeUILinuxProxyConfigHost ||
-           url.host() == chrome::kChromeUISandboxHost
- #endif
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc
deleted file mode 100644
index 39fe12eb057e..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__webui__extensions__extension_loader_handler.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig	2016-03-05 21:09:24.961590217 +0100
-+++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc	2016-03-05 21:09:41.001588829 +0100
-@@ -25,7 +25,11 @@
- #include "extensions/common/constants.h"
- #include "extensions/common/extension.h"
- #include "extensions/common/manifest_constants.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "ui/base/l10n/l10n_util.h"
- 
- namespace extensions {
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
deleted file mode 100644
index b1e113b23eb9..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2015-04-19 00:13:56.000000000 +0200
-+++ chrome/browser/ui/webui/options/browser_options_handler.cc	2015-04-19 00:14:26.000000000 +0200
-@@ -470,13 +470,13 @@
-     { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
- #endif  // defined(OS_CHROMEOS)
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-     { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
-     { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
-     { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
- #else
-     { "themes", IDS_THEMES_GROUP_NAME },
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
- 
- #if defined(OS_CHROMEOS) && defined(USE_ASH)
-     { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
-@@ -718,7 +718,7 @@
-       "requestProfilesInfo",
-       base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
-                  base::Unretained(this)));
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-   web_ui()->RegisterMessageCallback(
-       "themesSetNative",
-       base::Bind(&BrowserOptionsHandler::ThemesSetNative,
-@@ -1384,7 +1384,7 @@
-   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
-   bool is_system_theme = false;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-   bool profile_is_supervised = profile->IsSupervised();
-   is_system_theme = theme_service->UsingSystemTheme();
-   base::FundamentalValue native_theme_enabled(!is_system_theme &&
-@@ -1406,7 +1406,7 @@
-   ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
- void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
-   content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
-   Profile* profile = Profile::FromWebUI(web_ui());
diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
deleted file mode 100644
index 3df67d5c7640..000000000000
--- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2015-01-21 20:28:16 UTC
-+++ chrome/browser/ui/webui/options/browser_options_handler.h
-@@ -210,7 +210,7 @@
- 
-   void ObserveThemeChanged();
-   void ThemesReset(const base::ListValue* args);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
-   void ThemesSetNative(const base::ListValue* args);
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc b/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
deleted file mode 100644
index 37d0636fd436..000000000000
--- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/web_app.cc.orig	2014-10-10 08:54:11 UTC
-+++ chrome/browser/web_applications/web_app.cc
-@@ -424,7 +424,7 @@
- }
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- std::string GetWMClassFromAppName(std::string app_name) {
-   base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
-   base::TrimString(app_name, "_", &app_name);
diff --git a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h b/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
deleted file mode 100644
index 8285ed378ebb..000000000000
--- a/www/chromium/files/patch-chrome__browser__web_applications__web_app.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/web_applications/web_app.h.orig	2014-10-10 08:54:11 UTC
-+++ chrome/browser/web_applications/web_app.h
-@@ -208,7 +208,7 @@
- void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- // Windows that correspond to web apps need to have a deterministic (and
- // different) WMClass than normal chrome windows so the window manager groups
- // them as a separate application.
diff --git a/www/chromium/files/patch-chrome__chrome_browser.gypi b/www/chromium/files/patch-chrome__chrome_browser.gypi
deleted file mode 100644
index 2d4d47359278..000000000000
--- a/www/chromium/files/patch-chrome__chrome_browser.gypi
+++ /dev/null
@@ -1,43 +0,0 @@
---- chrome/chrome_browser.gypi.orig	2015-12-04 22:23:49.106516000 +0100
-+++ chrome/chrome_browser.gypi	2015-12-04 22:27:43.886261000 +0100
-@@ -3369,6 +3369,13 @@
-             'browser/download/download_dir_policy_handler.h',
-           ],
-         }],
-+        ['os_bsd==1', {
-+          'sources/': [
-+            ['exclude', '^browser/chrome_browser_main_linux.cc'],
-+            ['exclude', '^browser/chrome_browser_main_linux.h'],
-+            ['exclude', '^browser/media_galleries/linux/'],
-+          ],
-+        }],
-         ['OS=="mac"', {
-           'dependencies': [
-             'app_shim',
-@@ -3522,7 +3529,7 @@
-             '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
-           ],
-         }],
--        ['OS=="linux" and chromeos==0', {
-+        ['(OS=="linux" and chromeos==0) or os_bsd==1', {
-           'dependencies': [
-             '../build/linux/system.gyp:libspeechd',
-           ],
-@@ -3576,7 +3583,7 @@
-         ['use_x11==1', {
-           'sources': [ '<@(chrome_browser_x11_sources)' ],
-         }],
--        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
-+        ['os_posix == 1 and os_bsd != 1 and OS != "mac" and OS != "ios"', {
-           'sources': [
-             'app/chrome_crash_reporter_client.cc',
-             'app/chrome_crash_reporter_client.h',
-@@ -3817,7 +3824,7 @@
-             }],
-           ],
-         }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or os_bsd==1', {
-           'conditions': [
-             ['use_aura==1', {
-               'dependencies': [
diff --git a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi b/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
deleted file mode 100644
index 1a6999382372..000000000000
--- a/www/chromium/files/patch-chrome__chrome_browser_extensions.gypi
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/chrome_browser_extensions.gypi.orig	2014-10-10 09:15:30 UTC
-+++ chrome/chrome_browser_extensions.gypi
-@@ -950,6 +950,11 @@
-         '<@(chrome_browser_extensions_enabled_sources)',
-       ],
-       'conditions': [
-+        ['os_bsd==1', {
-+         'sources/': [
-+            ['exclude', '^browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc'],
-+         ],
-+        }],
-         ['chromeos==1', {
-           'dependencies': [
-             '../build/linux/system.gyp:dbus',
diff --git a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi b/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
deleted file mode 100644
index 1348edac9312..000000000000
--- a/www/chromium/files/patch-chrome__chrome_browser_ui.gypi
+++ /dev/null
@@ -1,33 +0,0 @@
---- chrome/chrome_browser_ui.gypi.orig	2015-10-14 16:42:08.849931000 +0200
-+++ chrome/chrome_browser_ui.gypi	2015-10-14 16:45:35.205417000 +0200
-@@ -2921,7 +2921,7 @@
-             }],
-           ],
-         }],
--        ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
-+        ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or os_bsd==1)', {
-           'dependencies': [
-             # gtk2 is the only component that can interact with gtk2 in our new
-             # world.
-@@ -2929,7 +2929,7 @@
-             '../build/linux/system.gyp:gio',
-           ],
-         }],
--        ['OS=="win" or OS=="mac" or desktop_linux==1', {
-+        ['OS=="win" or OS=="mac" or desktop_linux==1 or os_bsd==1', {
-           # A temporary define to make it easier to remove CrOS dependencies on
-           # avatar button code. TODO(estade): remove.
-           'defines': [ 'FRAME_AVATAR_BUTTON=1', ],
-@@ -3095,10 +3095,10 @@
-             }],
-           ],
-         }],
--        ['desktop_linux==1', {
-+        ['desktop_linux==1 or os_bsd==1', {
-           'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
-         }],
--        ['OS=="linux"', {  # Both desktop Linux and ChromeOS.
-+        ['OS=="linux" or OS=="freebsd"', {  # Both desktop Linux and ChromeOS.
-           'sources': [ '<@(chrome_browser_ui_linux_sources)' ],
-           'conditions': [
-             ['use_aura==1', {
diff --git a/www/chromium/files/patch-chrome__chrome_common.gypi b/www/chromium/files/patch-chrome__chrome_common.gypi
deleted file mode 100644
index 753d2fe38997..000000000000
--- a/www/chromium/files/patch-chrome__chrome_common.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
---- chrome/chrome_common.gypi.orig	2015-10-21 18:00:37.000000000 -0400
-+++ chrome/chrome_common.gypi	2015-10-23 12:33:22.684474000 -0400
-@@ -43,8 +43,8 @@
-       'common/common_param_traits.cc',
-       'common/common_param_traits.h',
-       'common/common_param_traits_macros.h',
--      'common/component_flash_hint_file_linux.cc',
--      'common/component_flash_hint_file_linux.h',
-+#      'common/component_flash_hint_file_linux.cc',
-+#      'common/component_flash_hint_file_linux.h',
-       'common/content_restriction.h',
-       'common/content_settings_pattern_serializer.cc',
-       'common/content_settings_pattern_serializer.h',
diff --git a/www/chromium/files/patch-chrome__chrome_exe.gypi b/www/chromium/files/patch-chrome__chrome_exe.gypi
deleted file mode 100644
index 703f52d8dc07..000000000000
--- a/www/chromium/files/patch-chrome__chrome_exe.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/chrome_exe.gypi.orig	2015-04-20 20:19:42.000000000 +0200
-+++ chrome/chrome_exe.gypi	2015-04-20 20:21:17.000000000 +0200
-@@ -190,7 +190,7 @@
-                 '../build/linux/system.gyp:xext',
-               ],
-             }],
--            ['OS=="linux" and enable_plugins==1', {
-+            ['(OS=="linux" or os_bsd==1) and enable_plugins==1', {
-               'dependencies': [
-                 '../pdf/pdf.gyp:pdf',
-               ],
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.cc b/www/chromium/files/patch-chrome__common__chrome_paths.cc
deleted file mode 100644
index 705d0d25e2ed..000000000000
--- a/www/chromium/files/patch-chrome__common__chrome_paths.cc
+++ /dev/null
@@ -1,53 +0,0 @@
---- chrome/common/chrome_paths.cc.orig	2014-10-10 08:54:11 UTC
-+++ chrome/common/chrome_paths.cc
-@@ -198,7 +198,7 @@
-         return false;
-       break;
-     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-       if (!GetUserDownloadsDirectorySafe(&cur))
-         return false;
-       break;
-@@ -488,10 +488,12 @@
-       if (!base::PathExists(cur))  // We don't want to create this
-         return false;
-       break;
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX)
-     case chrome::DIR_POLICY_FILES: {
- #if defined(GOOGLE_CHROME_BUILD)
-       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
-+#elif defined(OS_BSD)
-+      cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
- #else
-       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
- #endif
-@@ -557,7 +559,7 @@
- #endif
-       break;
- 
--#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
-+#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
-     case chrome::DIR_NATIVE_MESSAGING:
- #if defined(OS_MACOSX)
- #if defined(GOOGLE_CHROME_BUILD)
-@@ -571,6 +573,9 @@
- #if defined(GOOGLE_CHROME_BUILD)
-       cur = base::FilePath(FILE_PATH_LITERAL(
-           "/etc/opt/chrome/native-messaging-hosts"));
-+#elif defined(OS_BSD)
-+      cur = base::FilePath(FILE_PATH_LITERAL(
-+          "/usr/local/etc/chrome/native-messaging-hosts"));
- #else
-       cur = base::FilePath(FILE_PATH_LITERAL(
-           "/etc/chromium/native-messaging-hosts"));
-@@ -583,7 +588,7 @@
-         return false;
-       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
-       break;
--#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
-+#endif  // defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
- #if !defined(OS_ANDROID)
-     case chrome::DIR_GLOBAL_GCM_STORE:
-       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths.h b/www/chromium/files/patch-chrome__common__chrome_paths.h
deleted file mode 100644
index a1fc71476329..000000000000
--- a/www/chromium/files/patch-chrome__common__chrome_paths.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- chrome/common/chrome_paths.h.orig	2015-12-04 22:29:29.523602000 +0100
-+++ chrome/common/chrome_paths.h	2015-12-04 22:31:37.428818000 +0100
-@@ -50,7 +50,7 @@
-   DIR_USER_APPLICATIONS,        // ~/Applications
-   DIR_USER_LIBRARY,             // ~/Library
- #endif
--#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
-+#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
-   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
-                                  // on Chrome Mac and Chromium Linux.
-@@ -117,7 +117,7 @@
-   DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
-                                              // supervised user whitelists are
-                                              // installed.
--#if defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
-+#if defined(OS_LINUX) || defined(OS_BSD) || (defined(OS_MACOSX) && !defined(OS_IOS))
-   DIR_NATIVE_MESSAGING,         // System directory where native messaging host
-                                 // manifest files are stored.
-   DIR_USER_NATIVE_MESSAGING,    // Directory with Native Messaging Hosts
-@@ -136,10 +136,10 @@
-   DIR_GEN_TEST_DATA,            // Directory where generated test data resides.
-   DIR_TEST_DATA,                // Directory where unit test data resides.
-   DIR_TEST_TOOLS,               // Directory where unit test tools reside.
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   FILE_COMPONENT_FLASH_HINT,    // A file in a known location that points to
-                                 // the component updated flash plugin.
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
- 
-   PATH_END
- };
diff --git a/www/chromium/files/patch-chrome__common__chrome_paths_internal.h b/www/chromium/files/patch-chrome__common__chrome_paths_internal.h
deleted file mode 100644
index aaf90a42eba0..000000000000
--- a/www/chromium/files/patch-chrome__common__chrome_paths_internal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/chrome_paths_internal.h.orig	2015-07-18 16:46:40.033337000 -0400
-+++ chrome/common/chrome_paths_internal.h	2015-07-18 16:51:35.226378000 -0400
-@@ -39,7 +39,7 @@
- // Get the path to the user's documents directory.
- bool GetUserDocumentsDirectory(base::FilePath* result);
- 
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // Gets the path to a safe default download directory for a user.
- bool GetUserDownloadsDirectorySafe(base::FilePath* result);
- #endif
diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.cc b/www/chromium/files/patch-chrome__common__chrome_switches.cc
deleted file mode 100644
index df15378d9584..000000000000
--- a/www/chromium/files/patch-chrome__common__chrome_switches.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- chrome/common/chrome_switches.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/common/chrome_switches.cc
-@@ -1275,13 +1275,13 @@
- const char kPasswordStore[]                 = "password-store";
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- // Triggers migration of user data directory to another directory
- // specified as a parameter. The migration is done under singleton lock,
- // and sanity checks are made to avoid corrupting the profile.
- // The browser exits after migration is complete.
- const char kMigrateDataDirForSxS[]          = "migrate-data-dir-for-sxs";
--#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#endif  // (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- 
- #if defined(OS_MACOSX)
- // Prevents Chrome from quitting when Chrome Apps are open.
diff --git a/www/chromium/files/patch-chrome__common__chrome_switches.h b/www/chromium/files/patch-chrome__common__chrome_switches.h
deleted file mode 100644
index c2b2942d9138..000000000000
--- a/www/chromium/files/patch-chrome__common__chrome_switches.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/chrome_switches.h.orig	2014-10-10 09:15:30 UTC
-+++ chrome/common/chrome_switches.h
-@@ -362,7 +362,7 @@
- extern const char kPasswordStore[];
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
- extern const char kMigrateDataDirForSxS[];
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h b/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
deleted file mode 100644
index 7045b654327f..000000000000
--- a/www/chromium/files/patch-chrome__common__component_flash_hint_file_linux.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- chrome/common/component_flash_hint_file_linux.h.orig	2015-10-15 10:25:32.927627000 +0200
-+++ chrome/common/component_flash_hint_file_linux.h	2015-10-15 10:25:53.911624000 +0200
-@@ -7,9 +7,9 @@
- 
- #include "build/build_config.h"
- 
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
- #error "This file only applies to the Linux component update of Flash."
--#endif  // !defined(OS_LINUX)
-+#endif  // !defined(OS_LINUX) && !defined(OS_FREEBSD)
- 
- #include <string>
- 
diff --git a/www/chromium/files/patch-chrome__common__extensions__command.cc b/www/chromium/files/patch-chrome__common__extensions__command.cc
deleted file mode 100644
index e551be2e079f..000000000000
--- a/www/chromium/files/patch-chrome__common__extensions__command.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/extensions/command.cc.orig	2015-04-14 18:18:50.000000000 -0400
-+++ chrome/common/extensions/command.cc	2015-04-28 09:31:06.624015000 -0400
-@@ -301,7 +301,7 @@
-   return values::kKeybindingPlatformMac;
- #elif defined(OS_CHROMEOS)
-   return values::kKeybindingPlatformChromeOs;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   return values::kKeybindingPlatformLinux;
- #else
-   return "";
diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc
deleted file mode 100644
index 89125844384a..000000000000
--- a/www/chromium/files/patch-chrome__common__pref_names.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/common/pref_names.cc.orig	2015-01-21 20:28:16 UTC
-+++ chrome/common/pref_names.cc
-@@ -895,7 +895,7 @@
- // supervised users.
- const char kRecordHistory[] = "settings.history_recorded";
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- // Linux specific preference on whether we should match the system theme.
- const char kUsesSystemTheme[] = "extensions.theme.use_system";
- #endif
-@@ -1425,7 +1425,7 @@
- // upgrade a unsafe location to a safe location.
- const char kDownloadDirUpgraded[] = "download.directory_upgrade";
- 
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
- const char kOpenPdfDownloadInSystemReader[] =
-     "download.open_pdf_in_system_reader";
diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h
deleted file mode 100644
index f9c4a959899a..000000000000
--- a/www/chromium/files/patch-chrome__common__pref_names.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/common/pref_names.h.orig	2015-01-21 20:28:16 UTC
-+++ chrome/common/pref_names.h
-@@ -291,7 +291,7 @@
- extern const char kRecordHistory[];
- extern const char kDeleteTimePeriod[];
- extern const char kLastClearBrowsingDataTime[];
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
- extern const char kUsesSystemTheme[];
- #endif
- extern const char kCurrentThemePackFilename[];
-@@ -486,7 +486,7 @@
- extern const char kDownloadDefaultDirectory[];
- extern const char kDownloadExtensionsToOpen[];
- extern const char kDownloadDirUpgraded[];
--#if defined(OS_WIN) || defined(OS_LINUX) || \
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
-     (defined(OS_MACOSX) && !defined(OS_IOS))
- extern const char kOpenPdfDownloadInSystemReader[];
- #endif
diff --git a/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp b/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
deleted file mode 100644
index bc02e70ace17..000000000000
--- a/www/chromium/files/patch-chrome__common__variations__fieldtrial_testing_config.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/common/variations/fieldtrial_testing_config.gyp.orig	2015-12-16 21:13:34.948159764 +0100
-+++ chrome/common/variations/fieldtrial_testing_config.gyp	2015-12-16 21:14:00.477158698 +0100
-@@ -19,7 +19,7 @@
-       'conditions': [
-         ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}],
-         ['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}],
--        ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}],
-+        ['(OS!="linux" or chromeos==1) and os_bsd!=1', {'sources/': [['exclude', '_linux\\.json$']]}],
-         ['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}],
-         ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}],
-         ['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}],
diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
deleted file mode 100644
index b252dca03574..000000000000
--- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2016-01-21 15:55:11.104140125 +0100
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc	2016-01-21 15:57:35.816130405 +0100
-@@ -14,7 +14,7 @@
- #include "ppapi/proxy/ppapi_messages.h"
- #include "ppapi/proxy/serialized_structs.h"
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "content/public/common/child_process_sandbox_support_linux.h"
- #elif defined(OS_WIN)
- #include "third_party/skia/include/ports/SkFontMgr.h"
-@@ -27,7 +27,7 @@
-     const ppapi::proxy::SerializedFontDescription& description,
-     PP_PrivateFontCharset charset)
-     : ResourceHost(host->GetPpapiHost(), instance, resource) {
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   fd_.reset(content::MatchFontWithFallback(
-       description.face,
-       description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
-@@ -44,7 +44,7 @@
-   skia::RefPtr<SkFontMgr> font_mgr = skia::AdoptRef(SkFontMgr::RefDefault());
-   typeface_ = skia::AdoptRef(
-       font_mgr->matchFamilyStyle(description.face.c_str(), style));
--#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- }
- 
- PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
-@@ -63,7 +63,7 @@
-                                           void* buffer,
-                                           size_t* length) {
-   bool result = false;
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   int fd = fd_.get();
-   if (fd != -1)
-     result = content::GetFontTable(fd, table, 0 /* offset */,
diff --git a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h b/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h
deleted file mode 100644
index 0b9c4183069b..000000000000
--- a/www/chromium/files/patch-chrome__renderer__pepper__pepper_flash_font_file_host.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2014-10-10 09:15:30 UTC
-+++ chrome/renderer/pepper/pepper_flash_font_file_host.h
-@@ -10,7 +10,7 @@
- #include "ppapi/c/private/pp_private_font_charset.h"
- #include "ppapi/host/resource_host.h"
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/files/scoped_file.h"
- #endif
- 
-@@ -45,7 +45,7 @@
-   // Non-owning pointer.
-   content::RendererPpapiHost* renderer_ppapi_host_;
- 
--#if defined(OS_LINUX) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   base::ScopedFD fd_;
- #endif
- 
diff --git a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc b/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
deleted file mode 100644
index d49605347905..000000000000
--- a/www/chromium/files/patch-chrome__test__base__in_process_browser_test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- chrome/test/base/in_process_browser_test.cc.orig	2014-10-10 09:15:30 UTC
-+++ chrome/test/base/in_process_browser_test.cc
-@@ -76,6 +76,10 @@
- 
- namespace {
- 
-+#if defined(OS_FREEBSD)
-+#include <signal.h>
-+#endif
-+
- // Passed as value of kTestType.
- const char kBrowserTestType[] = "browser";
- 
diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
deleted file mode 100644
index 8c6ba2fc9d11..000000000000
--- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- chrome/test/base/testing_browser_process.h.orig	2015-01-21 20:28:16 UTC
-+++ chrome/test/base/testing_browser_process.h
-@@ -103,8 +103,8 @@
-   DownloadStatusUpdater* download_status_updater() override;
-   DownloadRequestLimiter* download_request_limiter() override;
- 
--#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
--  void StartAutoupdateTimer() override {}
-+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
-+  void StartAutoupdateTimer() /*override*/ {}
- #endif
- 
-   ChromeNetLog* net_log() override;
diff --git a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc b/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
deleted file mode 100644
index e7846bd56f7e..000000000000
--- a/www/chromium/files/patch-chrome__test__chromedriver__chrome__chrome_finder.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2014-10-10 08:54:12 UTC
-+++ chrome/test/chromedriver/chrome/chrome_finder.cc
-@@ -42,7 +42,7 @@
-         installation_locations[i].Append(L"Chromium\\Application"));
-   }
- }
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- void GetApplicationDirs(std::vector<base::FilePath>* locations) {
-   locations->push_back(base::FilePath("/opt/google/chrome"));
-   locations->push_back(base::FilePath("/usr/local/bin"));
-@@ -92,7 +92,7 @@
- #elif defined(OS_MACOSX)
-       base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
-       base::FilePath("Chromium.app/Contents/MacOS/Chromium")
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-       base::FilePath("google-chrome"),
-       base::FilePath("chrome"),
-       base::FilePath("chromium"),
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
new file mode 100644
index 000000000000..3a43a67f2470
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -0,0 +1,65 @@
+--- chrome/app/chrome_main_delegate.cc.orig	2016-05-11 19:02:13 UTC
++++ chrome/app/chrome_main_delegate.cc
+@@ -112,7 +112,7 @@
+ #include "ui/base/x/x11_util.h"
+ #endif
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "components/crash/content/app/breakpad_linux.h"
+ #endif
+ 
+@@ -552,7 +552,7 @@ bool ChromeMainDelegate::BasicStartupCom
+       std::string format_str =
+           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
+       if (format_str == "machine") {
+-        format = diagnostics::DiagnosticsWriter::MACHINE;
++        format = diagnostics::DiagnosticsWriter::THEMACHINE;
+       } else if (format_str == "log") {
+         format = diagnostics::DiagnosticsWriter::LOG;
+       } else {
+@@ -602,7 +602,7 @@ bool ChromeMainDelegate::BasicStartupCom
+       std::string format_str =
+           command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat);
+       if (format_str == "machine") {
+-        format = diagnostics::DiagnosticsWriter::MACHINE;
++        format = diagnostics::DiagnosticsWriter::THEMACHINE;
+       } else if (format_str == "human") {
+         format = diagnostics::DiagnosticsWriter::HUMAN;
+       } else {
+@@ -693,7 +693,7 @@ void ChromeMainDelegate::PreSandboxStart
+   std::string process_type =
+       command_line.GetSwitchValueASCII(switches::kProcessType);
+ 
+-#if defined(OS_POSIX)
++#if defined(OS_POSIX) && !defined(OS_BSD)
+   crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer());
+ #endif
+ 
+@@ -814,7 +814,7 @@ void ChromeMainDelegate::PreSandboxStart
+   chrome::InitializePDF();
+ #endif
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   // Zygote needs to call InitCrashReporter() in RunZygote().
+   if (process_type != switches::kZygoteProcess) {
+ #if defined(OS_ANDROID)
+@@ -832,7 +832,7 @@ void ChromeMainDelegate::PreSandboxStart
+     breakpad::InitCrashReporter(process_type);
+ #endif  // defined(OS_ANDROID)
+   }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ 
+   // After all the platform Breakpads have been initialized, store the command
+   // line for crash reporting.
+@@ -942,7 +942,7 @@ bool ChromeMainDelegate::DelaySandboxIni
+ #endif
+   return process_type == switches::kRelauncherProcess;
+ }
+-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ void ChromeMainDelegate::ZygoteStarting(
+     ScopedVector<content::ZygoteForkDelegate>* delegates) {
+ #if defined(OS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.h b/www/chromium/files/patch-chrome_app_chrome__main__delegate.h
new file mode 100644
index 000000000000..d1952c48e87c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.h
@@ -0,0 +1,11 @@
+--- chrome/app/chrome_main_delegate.h.orig	2016-05-11 19:02:13 UTC
++++ chrome/app/chrome_main_delegate.h
+@@ -38,7 +38,7 @@ class ChromeMainDelegate : public conten
+       const std::string& process_type) override;
+   bool ShouldSendMachPort(const std::string& process_type) override;
+   bool DelaySandboxInitialization(const std::string& process_type) override;
+-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   void ZygoteStarting(
+       ScopedVector<content::ZygoteForkDelegate>* delegates) override;
+   void ZygoteForked() override;
diff --git a/www/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
new file mode 100644
index 000000000000..e18b999c2cad
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -0,0 +1,11 @@
+--- chrome/app/chromium_strings.grd.orig	2016-05-11 19:02:13 UTC
++++ chrome/app/chromium_strings.grd
+@@ -948,7 +948,7 @@ Signing in anyway will merge Chromium in
+       </message>
+ 
+       <!-- ProcessSingleton -->
+-      <if expr="is_linux or is_macosx">
++      <if expr="is_linux or is_macosx or is_bsd">
+         <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
+           The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
+         </message>
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
new file mode 100644
index 000000000000..d33fe985f4f4
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -0,0 +1,11 @@
+--- chrome/app/generated_resources.grd.orig	2016-05-11 19:02:13 UTC
++++ chrome/app/generated_resources.grd
+@@ -6564,7 +6564,7 @@ Keep your key file in a safe place. You 
+       <message name="IDS_FLAGS_FORCE_UI_DIRECTION_RTL" desc="Name for the option to force right-to-left UI direction mode.">
+           Right-to-left
+       </message>
+-      <if expr="is_win or is_linux">
++      <if expr="is_win or is_linux or is_posix">
+         <message name="IDS_FLAGS_ENABLE_INPUT_IME_API_NAME" desc="Name of the flag to enable che chrome.input.ime API.">
+           Enable Input IME API
+         </message>
diff --git a/www/chromium/files/patch-chrome_app_resources_locale__settings.grd b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd
new file mode 100644
index 000000000000..94b0af26831c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_app_resources_locale__settings.grd
@@ -0,0 +1,11 @@
+--- chrome/app/resources/locale_settings.grd.orig	2016-05-11 19:02:13 UTC
++++ chrome/app/resources/locale_settings.grd
+@@ -156,7 +156,7 @@
+         55
+       </message>
+ 
+-      <if expr="is_win or is_linux or chromeos">
++      <if expr="is_win or is_linux or chromeos or is_bsd">
+         <!-- The width of the ash/ChromeOS system tray menu in pixels. -->
+         <message name="IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS" use_name_for_id="true">
+           300
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
new file mode 100644
index 000000000000..12f514466f5f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/about_flags.cc.orig	2016-05-11 19:02:13 UTC
++++ chrome/browser/about_flags.cc
+@@ -673,7 +673,7 @@ const FeatureEntry kFeatureEntries[] = {
+      kOsLinux | kOsCrOS | kOsWin | kOsAndroid,
+      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableSmoothScrolling,
+                                switches::kDisableSmoothScrolling)},
+-#if defined(USE_AURA) || defined(OS_LINUX)
++#if defined(USE_AURA) || defined(OS_LINUX) || defined(OS_BSD)
+     {"overlay-scrollbars", IDS_FLAGS_OVERLAY_SCROLLBARS_NAME,
+      IDS_FLAGS_OVERLAY_SCROLLBARS_DESCRIPTION,
+      // Uses the system preference on Mac (a different implementation).
+@@ -1729,7 +1729,7 @@ const FeatureEntry kFeatureEntries[] = {
+      IDS_FLAGS_ENABLE_MATERIAL_DESIGN_EXTENSIONS_DESCRIPTION, kOsDesktop,
+      SINGLE_VALUE_TYPE(switches::kEnableMaterialDesignExtensions)},
+ #endif
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+     {"enable-input-ime-api", IDS_FLAGS_ENABLE_INPUT_IME_API_NAME,
+      IDS_FLAGS_ENABLE_INPUT_IME_API_DESCRIPTION, kOsWin | kOsLinux,
+      ENABLE_DISABLE_VALUE_TYPE(switches::kEnableInputImeAPI,
diff --git a/www/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
new file mode 100644
index 000000000000..72c4cde217aa
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -0,0 +1,11 @@
+--- chrome/browser/browser_resources.grd.orig	2016-05-11 19:02:13 UTC
++++ chrome/browser/browser_resources.grd
+@@ -280,7 +280,7 @@
+         <include name="IDR_ABOUT_VOICESEARCH_JS" file="resources\about_voicesearch.js" type="BINDATA" />
+         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
+       </if>
+-      <if expr="desktop_linux or (is_android and enable_plugins)">
++      <if expr="desktop_linux or (is_android and enable_plugins) or is_posix">
+         <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
+       </if>
+       <if expr="is_android">
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
new file mode 100644
index 000000000000..e19f5899e35b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -0,0 +1,25 @@
+--- chrome/browser/chrome_browser_main.cc.orig	2016-05-25 15:00:57.000000000 -0400
++++ chrome/browser/chrome_browser_main.cc	2016-05-27 09:43:16.154885000 -0400
+@@ -173,7 +173,7 @@
+ #include "chrome/browser/feedback/feedback_profile_observer.h"
+ #endif  // defined(OS_ANDROID)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "chrome/browser/first_run/upgrade_util_linux.h"
+ #endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ 
+@@ -1109,11 +1109,11 @@
+   }
+ #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Set the product channel for crash reports.
+   base::debug::SetCrashKeyValue(crash_keys::kChannel,
+                                 chrome::GetChannelString());
+-#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ 
+   // Initialize tracking synchronizer system.
+   tracking_synchronizer_ = new metrics::TrackingSynchronizer(
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
new file mode 100644
index 000000000000..9b4a2c5f3252
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -0,0 +1,27 @@
+--- chrome/browser/chrome_browser_main_linux.cc.orig	2016-05-21 16:00:15 UTC
++++ chrome/browser/chrome_browser_main_linux.cc
+@@ -62,12 +62,14 @@ void ChromeBrowserMainPartsLinux::PrePro
+ void ChromeBrowserMainPartsLinux::PostProfileInit() {
+   ChromeBrowserMainPartsPosix::PostProfileInit();
+ 
++#if !defined(OS_BSD)
+   g_browser_process->metrics_service()->RecordBreakpadRegistration(
+       breakpad::IsCrashReporterEnabled());
++#endif
+ }
+ 
+ void ChromeBrowserMainPartsLinux::PostMainMessageLoopStart() {
+-#if !defined(OS_CHROMEOS)
++#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+   bluez::DBusThreadManagerLinux::Initialize();
+   bluez::BluezDBusManager::Initialize(
+       bluez::DBusThreadManagerLinux::Get()->GetSystemBus(), false);
+@@ -77,7 +79,7 @@ void ChromeBrowserMainPartsLinux::PostMa
+ }
+ 
+ void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
+-#if !defined(OS_CHROMEOS)
++#if !defined(OS_CHROMEOS) && !defined(OS_BSD)
+   bluez::BluezDBusManager::Shutdown();
+   bluez::DBusThreadManagerLinux::Shutdown();
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
new file mode 100644
index 000000000000..465425556ca7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__posix.cc
@@ -0,0 +1,22 @@
+--- chrome/browser/chrome_browser_main_posix.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/chrome_browser_main_posix.cc
+@@ -274,6 +274,11 @@ void ChromeBrowserMainPartsPosix::PostMa
+     g_pipe_pid = getpid();
+     g_shutdown_pipe_read_fd = pipefd[0];
+     g_shutdown_pipe_write_fd = pipefd[1];
++#if defined(OS_FREEBSD)
++    // PTHREAD_STACK_MIN causes chromium to crash under FreeBSD,
++    // we request the default pthread stack size by specifying 0 here.
++    const size_t kShutdownDetectorThreadStackSize = 0;
++#else
+ #if !defined(ADDRESS_SANITIZER) && !defined(KEEP_SHADOW_STACKS)
+     const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2;
+ #else
+@@ -282,6 +287,7 @@ void ChromeBrowserMainPartsPosix::PostMa
+     // size to avoid hitting the guard page.
+     const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4;
+ #endif
++#endif // OS_FREEBSD
+     // TODO(viettrungluu,willchan): crbug.com/29675 - This currently leaks, so
+     // if you change this, you'll probably need to change the suppression.
+     if (!base::PlatformThread::CreateNonJoinable(
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
new file mode 100644
index 000000000000..617b605ad503
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -0,0 +1,74 @@
+--- chrome/browser/chrome_content_browser_client.cc.orig	2016-05-11 19:02:13 UTC
++++ chrome/browser/chrome_content_browser_client.cc
+@@ -191,7 +191,7 @@
+ #include "chrome/browser/chromeos/system/input_device_settings.h"
+ #include "chromeos/chromeos_switches.h"
+ #include "components/user_manager/user_manager.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/chrome_browser_main_linux.h"
+ #elif defined(OS_ANDROID)
+ #include "chrome/browser/chrome_browser_main_android.h"
+@@ -204,7 +204,7 @@
+ #include "chrome/browser/chrome_browser_main_posix.h"
+ #endif
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "base/debug/leak_annotations.h"
+ #include "components/crash/content/app/breakpad_linux.h"
+ #include "components/crash/content/browser/crash_handler_host_linux.h"
+@@ -225,7 +225,7 @@
+ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h"
+ #endif
+ 
+@@ -502,7 +502,7 @@ bool CertMatchesFilter(const net::X509Ce
+   return false;
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
+     const std::string& process_type) {
+   base::FilePath dumps_path;
+@@ -782,7 +782,7 @@ content::BrowserMainParts* ChromeContent
+   main_parts = new ChromeBrowserMainPartsMac(parameters);
+ #elif defined(OS_CHROMEOS)
+   main_parts = new chromeos::ChromeBrowserMainPartsChromeos(parameters);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   main_parts = new ChromeBrowserMainPartsLinux(parameters);
+ #elif defined(OS_ANDROID)
+   main_parts = new ChromeBrowserMainPartsAndroid(parameters);
+@@ -798,7 +798,7 @@ content::BrowserMainParts* ChromeContent
+   // Construct additional browser parts. Stages are called in the order in
+   // which they are added.
+ #if defined(TOOLKIT_VIEWS)
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   main_parts->AddParts(new ChromeBrowserMainExtraPartsViewsLinux());
+ #else
+   main_parts->AddParts(new ChromeBrowserMainExtraPartsViews());
+@@ -1428,7 +1428,7 @@ void ChromeContentBrowserClient::AppendE
+     command_line->AppendSwitchASCII(switches::kMetricsClientID,
+                                     client_info->client_id);
+   }
+-#elif defined(OS_POSIX)
++#elif defined(OS_POSIX) && !defined(OS_BSD)
+   if (breakpad::IsCrashReporterEnabled()) {
+     std::string switch_value;
+     scoped_ptr<metrics::ClientInfo> client_info =
+@@ -2637,7 +2637,7 @@ void ChromeContentBrowserClient::GetAddi
+   PathService::Get(base::DIR_ANDROID_APP_DATA, &app_data_path);
+   DCHECK(!app_data_path.empty());
+ }
+-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+     const base::CommandLine& command_line,
+     int child_process_id,
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
new file mode 100644
index 000000000000..56b0f44a1442
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -0,0 +1,11 @@
+--- chrome/browser/chrome_content_browser_client.h.orig	2016-05-11 19:02:13 UTC
++++ chrome/browser/chrome_content_browser_client.h
+@@ -272,7 +272,7 @@ class ChromeContentBrowserClient : publi
+       int child_process_id,
+       content::FileDescriptorInfo* mappings,
+       std::map<int, base::MemoryMappedFile::Region>* regions) override;
+-#elif defined(OS_POSIX) && !defined(OS_MACOSX)
++#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
+   void GetAdditionalMappedFilesForChildProcess(
+       const base::CommandLine& command_line,
+       int child_process_id,
diff --git a/www/chromium/files/patch-chrome_browser_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc
new file mode 100644
index 000000000000..5a1418d627db
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_defaults.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/defaults.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/defaults.cc
+@@ -46,7 +46,7 @@ const bool kSyncAutoStarts = false;
+ const bool kShowOtherBrowsersInAboutMemory = true;
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ const bool kScrollEventChangesTab = true;
+ #else
+ const bool kScrollEventChangesTab = false;
diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
new file mode 100644
index 000000000000..6b89bf4ba063
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/diagnostics/diagnostics_writer.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/diagnostics/diagnostics_writer.cc
+@@ -263,7 +263,7 @@ bool DiagnosticsWriter::WriteResult(bool
+       console_->SetColor(color);
+       console_->Write(base::ASCIIToUTF16(result));
+     }
+-    if (format_ == MACHINE) {
++    if (format_ == THEMACHINE) {
+       return WriteInfoLine(base::StringPrintf(
+           "%03d %s (%s)", outcome_code, id.c_str(), extra.c_str()));
+     } else {
diff --git a/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
new file mode 100644
index 000000000000..dd45d1664d8e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_diagnostics_diagnostics__writer.h
@@ -0,0 +1,11 @@
+--- chrome/browser/diagnostics/diagnostics_writer.h.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/diagnostics/diagnostics_writer.h
+@@ -18,7 +18,7 @@ class DiagnosticsWriter : public Diagnos
+  public:
+   // The type of formatting done by this writer.
+   enum FormatType {
+-    MACHINE,
++    THEMACHINE,
+     LOG,
+     HUMAN
+   };
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
new file mode 100644
index 000000000000..7311df998ed0
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/download/chrome_download_manager_delegate.cc
+@@ -736,7 +736,7 @@ void ChromeDownloadManagerDelegate::OnDo
+         target_info->is_filetype_handled_safely)
+       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
+ 
+-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
+     if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
+       DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
+ #endif
+@@ -751,7 +751,7 @@ void ChromeDownloadManagerDelegate::OnDo
+ 
+ bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
+     const base::FilePath& path) {
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
+     return !download_prefs_->ShouldOpenPdfInSystemReader();
+   }
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.cc b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
new file mode 100644
index 000000000000..66d933d29aff
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.cc
@@ -0,0 +1,38 @@
+--- chrome/browser/download/download_commands.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/download/download_commands.cc
+@@ -211,7 +211,7 @@ bool DownloadCommands::IsCommandChecked(
+       return download_item_->GetOpenWhenComplete() ||
+              download_crx_util::IsExtensionDownload(*download_item_);
+     case ALWAYS_OPEN_TYPE:
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+       if (CanOpenPdfInSystemViewer()) {
+         DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
+             download_item_->GetBrowserContext());
+@@ -254,7 +254,7 @@ void DownloadCommands::ExecuteCommand(Co
+       bool is_checked = IsCommandChecked(ALWAYS_OPEN_TYPE);
+       DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(
+           download_item_->GetBrowserContext());
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+       if (CanOpenPdfInSystemViewer()) {
+         prefs->SetShouldOpenPdfInSystemReader(!is_checked);
+         DownloadItemModel(download_item_)
+@@ -352,7 +352,7 @@ Browser* DownloadCommands::GetBrowser() 
+   return browser_displayer.browser();
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ bool DownloadCommands::IsDownloadPdf() const {
+   base::FilePath path = download_item_->GetTargetFilePath();
+   return path.MatchesExtension(FILE_PATH_LITERAL(".pdf"));
+@@ -369,7 +369,7 @@ bool DownloadCommands::CanOpenPdfInSyste
+   return IsDownloadPdf() &&
+          (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date
+                                           : true);
+-#elif defined(OS_MACOSX) || defined(OS_LINUX)
++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   return IsDownloadPdf();
+ #endif
+ }
diff --git a/www/chromium/files/patch-chrome_browser_download_download__commands.h b/www/chromium/files/patch-chrome_browser_download_download__commands.h
new file mode 100644
index 000000000000..52e9e612da44
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_download__commands.h
@@ -0,0 +1,12 @@
+--- chrome/browser/download/download_commands.h.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/download/download_commands.h
+@@ -42,7 +42,8 @@ class DownloadCommands {
+   void ExecuteCommand(Command command);
+ 
+ #if defined(OS_WIN) || defined(OS_LINUX) || \
+-    (defined(OS_MACOSX) && !defined(OS_IOS))
++    defined(OS_BSD) || (defined(OS_MACOSX) && \
++    !defined(OS_IOS))
+   bool IsDownloadPdf() const;
+   bool CanOpenPdfInSystemViewer() const;
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
new file mode 100644
index 000000000000..657dbd8fe0cc
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -0,0 +1,65 @@
+--- chrome/browser/download/download_prefs.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/download/download_prefs.cc
+@@ -55,7 +55,7 @@ namespace {
+ // Consider downloads 'dangerous' if they go to the home directory on Linux and
+ // to the desktop on any platform.
+ bool DownloadPathIsDangerous(const base::FilePath& download_path) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::FilePath home_dir = base::GetHomeDir();
+   if (download_path == home_dir) {
+     return true;
+@@ -135,7 +135,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr
+                  GetDefaultDownloadDirectoryForProfile()));
+ #endif  // defined(OS_CHROMEOS)
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   should_open_pdf_in_system_reader_ =
+       prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
+ #endif
+@@ -211,7 +211,7 @@ void DownloadPrefs::RegisterProfilePrefs
+                                  default_download_path);
+   registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory,
+                                  default_download_path);
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
+ #endif
+ }
+@@ -288,7 +288,7 @@ bool DownloadPrefs::IsDownloadPathManage
+ }
+ 
+ bool DownloadPrefs::IsAutoOpenUsed() const {
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   if (ShouldOpenPdfInSystemReader())
+     return true;
+ #endif
+@@ -302,7 +302,7 @@ bool DownloadPrefs::IsAutoOpenEnabledBas
+     return false;
+   DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
+   extension.erase(0, 1);
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader())
+     return true;
+ #endif
+@@ -335,7 +335,7 @@ void DownloadPrefs::DisableAutoOpenBased
+   SaveAutoOpenState();
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
+   if (should_open_pdf_in_system_reader_ == should_open)
+     return;
+@@ -356,7 +356,7 @@ bool DownloadPrefs::ShouldOpenPdfInSyste
+ #endif
+ 
+ void DownloadPrefs::ResetAutoOpen() {
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   SetShouldOpenPdfInSystemReader(false);
+ #endif
+   auto_open_.clear();
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
new file mode 100644
index 000000000000..2964011eaa60
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -0,0 +1,20 @@
+--- chrome/browser/download/download_prefs.h.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/download/download_prefs.h
+@@ -79,7 +79,7 @@ class DownloadPrefs {
+   // Disables auto-open based on file extension.
+   void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name);
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   // Store the user preference to disk. If |should_open| is true, also disable
+   // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
+   void SetShouldOpenPdfInSystemReader(bool should_open);
+@@ -110,7 +110,7 @@ class DownloadPrefs {
+                    AutoOpenCompareFunctor> AutoOpenSet;
+   AutoOpenSet auto_open_;
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+   bool should_open_pdf_in_system_reader_;
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_download_download__query.cc b/www/chromium/files/patch-chrome_browser_download_download__query.cc
new file mode 100644
index 000000000000..b6ac2de45bf2
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_download__query.cc
@@ -0,0 +1,14 @@
+--- chrome/browser/download/download_query.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/download/download_query.cc
+@@ -31,7 +31,11 @@
+ #include "components/url_formatter/url_formatter.h"
+ #include "content/public/browser/content_browser_client.h"
+ #include "content/public/browser/download_item.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+ 
+ using content::DownloadDangerType;
diff --git a/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
new file mode 100644
index 000000000000..4f5ec786cfe7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_download_download__shelf__context__menu.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/download/download_shelf_context_menu.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/download/download_shelf_context_menu.cc
+@@ -142,7 +142,7 @@ base::string16 DownloadShelfContextMenu:
+                    : IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
+           break;
+         }
+-#elif defined(OS_MACOSX) || defined(OS_LINUX)
++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+         if (can_open_pdf_in_system_viewer) {
+           id = IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS;
+           break;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
new file mode 100644
index 000000000000..19ff8e0cb169
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_activity__log_activity__log.cc
@@ -0,0 +1,14 @@
+--- chrome/browser/extensions/activity_log/activity_log.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/extensions/activity_log/activity_log.cc
+@@ -39,7 +39,11 @@
+ #include "extensions/browser/extensions_browser_client.h"
+ #include "extensions/common/extension.h"
+ #include "extensions/common/one_shot_event.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+ 
+ namespace constants = activity_log_constants;
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc
new file mode 100644
index 000000000000..b3b6cb312b5e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_image__writer__private_image__writer__private__api.cc
@@ -0,0 +1,15 @@
+--- chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/extensions/api/image_writer_private/image_writer_private_api.cc
+@@ -166,10 +166,12 @@ ImageWriterPrivateListRemovableStorageDe
+ }
+ 
+ bool ImageWriterPrivateListRemovableStorageDevicesFunction::RunAsync() {
++#if !defined(OS_FREEBSD)
+   RemovableStorageProvider::GetAllDevices(
+     base::Bind(
+       &ImageWriterPrivateListRemovableStorageDevicesFunction::OnDeviceListReady,
+       this));
++#endif
+   return true;
+ }
+ 
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h
new file mode 100644
index 000000000000..ecf1bb8b0e57
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_input__ime_input__ime__api.h
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/api/input_ime/input_ime_api.h.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/extensions/api/input_ime/input_ime_api.h
+@@ -27,7 +27,7 @@
+ 
+ #if defined(OS_CHROMEOS)
+ #include "chrome/browser/extensions/api/input_ime/input_ime_api_chromeos.h"
+-#elif defined(OS_LINUX) || defined(OS_WIN)
++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ #include "chrome/browser/extensions/api/input_ime/input_ime_api_nonchromeos.h"
+ #endif  // defined(OS_CHROMEOS)
+ 
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
new file mode 100644
index 000000000000..f441ac6fcd95
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_messaging_message__service.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/api/messaging/message_service.cc.orig	2016-05-21 16:16:28 UTC
++++ chrome/browser/extensions/api/messaging/message_service.cc
+@@ -118,7 +118,7 @@ MessageService::PolicyPermission Message
+ 
+ const char kReceivingEndDoesntExistError[] =
+     "Could not establish connection. Receiving end does not exist.";
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ const char kMissingPermissionError[] =
+     "Access to native messaging requires nativeMessaging permission.";
+ const char kProhibitedByPoliciesError[] =
+@@ -415,7 +415,7 @@ void MessageService::OpenChannelToNative
+   if (!source)
+     return;
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+   Profile* profile =
+       Profile::FromBrowserContext(source->GetProcess()->GetBrowserContext());
+   ExtensionService* extension_service =
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
new file mode 100644
index 000000000000..0ae188069823
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_music__manager__private_device__id__linux.cc
@@ -0,0 +1,66 @@
+--- chrome/browser/extensions/api/music_manager_private/device_id_linux.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/extensions/api/music_manager_private/device_id_linux.cc
+@@ -4,6 +4,10 @@
+ 
+ #include "chrome/browser/extensions/api/music_manager_private/device_id.h"
+ 
++#if defined(OS_FREEBSD)
++#include <sys/types.h>
++#include <net/if_dl.h>
++#endif
+ #include <ifaddrs.h>
+ #include <net/if.h>
+ #include <stddef.h>
+@@ -105,11 +109,33 @@ class MacAddressProcessor {
+                         const char* const prefixes[],
+                         size_t prefixes_count) {
+     const int MAC_LENGTH = 6;
++#if defined(OS_FREEBSD)
++    struct ifaddrs *ifap, *ifinfo;
++#else
+     struct ifreq ifinfo;
++#endif
+ 
+     memset(&ifinfo, 0, sizeof(ifinfo));
+-    strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+ 
++#if defined(OS_FREEBSD)
++    int result = getifaddrs(&ifap);
++    if (result != 0)
++      return true;
++    result = 1; // no MAC found yet
++    for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
++      struct sockaddr* sa = ifinfo->ifa_addr;
++      if (sa->sa_family == AF_LINK &&
++        !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
++        sizeof(ifinfo->ifa_name) - 1)) { 
++          result = 0;
++	  break;
++      }
++    }
++
++    char mac_address[6];
++    strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
++#else
++    strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
+     int sd = socket(AF_INET, SOCK_DGRAM, 0);
+     int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
+     close(sd);
+@@ -119,11 +145,17 @@ class MacAddressProcessor {
+ 
+     const char* mac_address =
+         static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
++#endif
+     if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
+       return true;
+ 
++#if defined(OS_FREEBSD)
++    if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
++      return true;
++#else
+     if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
+       return true;
++#endif
+ 
+     // Got one!
+     found_mac_address_ =
diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
new file mode 100644
index 000000000000..e335be09d74a
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
+@@ -64,7 +64,7 @@
+ #include "chrome/browser/chromeos/extensions/media_player_api.h"
+ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
+ #include "chrome/browser/extensions/api/log_private/log_private_api.h"
+-#elif defined(OS_LINUX) || defined(OS_WIN)
++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
+ #endif
+ 
+@@ -105,7 +105,7 @@ void EnsureBrowserContextKeyedServiceFac
+ #if defined(OS_CHROMEOS)
+   extensions::InputImeAPI::GetFactoryInstance();
+   extensions::InputMethodAPI::GetFactoryInstance();
+-#elif defined(OS_LINUX) || defined(OS_WIN)
++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+   extensions::InputImeAPI::GetFactoryInstance();
+ #endif
+   extensions::LanguageSettingsPrivateDelegateFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
new file mode 100644
index 000000000000..7fa06d755e9e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/extensions/external_provider_impl.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/extensions/external_provider_impl.cc
+@@ -645,7 +645,7 @@ void ExternalProviderImpl::CreateExterna
+                                  Manifest::EXTERNAL_PREF_DOWNLOAD,
+                                  oem_extension_creation_flags)));
+   }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   if (!profile->IsLegacySupervised()) {
+     provider_list->push_back(
+         linked_ptr<ExternalProviderInterface>(
+@@ -687,7 +687,7 @@ void ExternalProviderImpl::CreateExterna
+                 bundled_extension_creation_flags)));
+ 
+     // Define a per-user source of external extensions.
+-#if defined(OS_MACOSX) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD))
++#if defined(OS_MACOSX) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD))
+     provider_list->push_back(
+         linked_ptr<ExternalProviderInterface>(
+             new ExternalProviderImpl(
diff --git a/www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc b/www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc
new file mode 100644
index 000000000000..b3261d7d3623
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_extensions_window__open__apitest.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/extensions/window_open_apitest.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/extensions/window_open_apitest.cc
+@@ -285,7 +285,7 @@ IN_PROC_BROWSER_TEST_F(WindowOpenPanelTe
+       << message_;
+ }
+ 
+-#if defined(USE_ASH_PANELS) || defined(OS_LINUX)
++#if defined(USE_ASH_PANELS) || defined(OS_LINUX) || defined(OS_FREEBSD)
+ // On Ash, this currently fails because we're currently opening new panel
+ // windows as popup windows instead.
+ // We're also failing on Linux-aura due to the panel is not opened in the
diff --git a/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc b/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc
new file mode 100644
index 000000000000..69d818483c6a
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_gpu_gl__string__manager.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/gpu/gl_string_manager.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/gpu/gl_string_manager.cc
+@@ -28,7 +28,7 @@ GLStringManager::~GLStringManager() {
+ 
+ void GLStringManager::Initialize() {
+   // On MacOSX or Windows, preliminary GPUInfo is enough.
+-#if defined(OS_LINUX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+   // We never remove this observer from GpuDataManager.
+   content::GpuDataManager::GetInstance()->AddObserver(this);
+ 
diff --git a/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc b/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc
new file mode 100644
index 000000000000..0a8b6347372b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_gpu_gpu__feature__checker.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/gpu/gpu_feature_checker.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/gpu/gpu_feature_checker.cc
+@@ -34,7 +34,7 @@ void GPUFeatureChecker::CheckGPUFeatureA
+   CHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
+ 
+   bool finalized = true;
+-#if defined(OS_LINUX)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
+   // On Windows and Mac, so far we can always make the final WebGL blacklisting
+   // decision based on partial GPU info; on Linux, we need to launch the GPU
+   // process to collect full GPU info and make the final decision.
diff --git a/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
new file mode 100644
index 000000000000..02310b36a189
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_interstitials_chrome__controller__client.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/interstitials/chrome_controller_client.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/interstitials/chrome_controller_client.cc
+@@ -55,7 +55,7 @@ void LaunchDateAndTimeSettingsOnFile() {
+   chrome::ShowSettingsSubPageForProfile(ProfileManager::GetActiveUserProfile(),
+                                         sub_page);
+ 
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   struct ClockCommand {
+     const char* pathname;
+     const char* argument;
+@@ -138,7 +138,7 @@ void ChromeControllerClient::set_interst
+ 
+ bool ChromeControllerClient::CanLaunchDateAndTimeSettings() {
+ #if defined(OS_ANDROID) || defined(OS_CHROMEOS) || defined(OS_LINUX) || \
+-    defined(OS_MACOSX) || defined(OS_WIN)
++    defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
+   return true;
+ #else
+   return false;
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
new file mode 100644
index 000000000000..fc79455804d1
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_fileapi_mtp__device__map__service.cc
@@ -0,0 +1,15 @@
+--- chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/media_galleries/fileapi/mtp_device_map_service.cc
+@@ -37,10 +37,12 @@ void MTPDeviceMapService::RegisterMTPFil
+     // Note that this initializes the delegate asynchronously, but since
+     // the delegate will only be used from the IO thread, it is guaranteed
+     // to be created before use of it expects it to be there.
++#if !defined(OS_FREEBSD)
+     CreateMTPDeviceAsyncDelegate(
+         device_location, read_only,
+         base::Bind(&MTPDeviceMapService::AddAsyncDelegate,
+                    base::Unretained(this), device_location, read_only));
++#endif
+     mtp_device_usage_map_[key] = 0;
+   }
+ 
diff --git a/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
new file mode 100644
index 000000000000..e2c3f7d10163
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_media__galleries_media__file__system__registry.cc
@@ -0,0 +1,14 @@
+--- chrome/browser/media_galleries/media_file_system_registry.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/media_galleries/media_file_system_registry.cc
+@@ -768,7 +768,10 @@ class MediaFileSystemRegistry::MediaFile
+ // Constructor in 'private' section because depends on private class definition.
+ MediaFileSystemRegistry::MediaFileSystemRegistry()
+     : file_system_context_(new MediaFileSystemContextImpl) {
+-  StorageMonitor::GetInstance()->AddObserver(this);
++  // This conditional is needed for shutdown.  Destructors
++  // try to get the media file system registry.
++  if (StorageMonitor::GetInstance())
++    StorageMonitor::GetInstance()->AddObserver(this);
+ }
+ 
+ MediaFileSystemRegistry::~MediaFileSystemRegistry() {
diff --git a/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc b/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc
new file mode 100644
index 000000000000..c3b4dc3ea749
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_media_webrtc__log__uploader.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/media/webrtc_log_uploader.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/media/webrtc_log_uploader.cc
+@@ -344,6 +344,8 @@ void WebRtcLogUploader::SetupMultipart(
+   const char product[] = "Chrome_Android";
+ #elif defined(OS_CHROMEOS)
+   const char product[] = "Chrome_ChromeOS";
++#elif defined(OS_FREEBSD)
++  const char product[] = "Chrome_FreeBSD";
+ #else
+ #error Platform not supported.
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_memory__details.cc b/www/chromium/files/patch-chrome_browser_memory__details.cc
new file mode 100644
index 000000000000..0d020afce397
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_memory__details.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/memory_details.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/memory_details.cc
+@@ -33,7 +33,7 @@
+ #include "content/public/common/content_constants.h"
+ #include "ui/base/l10n/l10n_util.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ #include "content/public/browser/zygote_host_linux.h"
+ #endif
+ 
+@@ -365,7 +365,7 @@ void MemoryDetails::CollectChildInfoOnUI
+       }
+     }
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+     if (content::ZygoteHost::GetInstance()->IsZygotePid(process.pid)) {
+       process.process_type = content::PROCESS_TYPE_ZYGOTE;
+     }
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
new file mode 100644
index 000000000000..633557bb5824
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -0,0 +1,18 @@
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
+@@ -38,12 +38,14 @@
+ 
+ #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+ #include <gnu/libc-version.h>
++#endif
+ 
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ #include "base/version.h"
+ #if defined(USE_X11)
+ #include "ui/base/x/x11_util.h"
+ #endif
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif
+ 
+ #if defined(USE_OZONE) || defined(USE_X11)
+ #include "ui/events/devices/device_data_manager.h"
diff --git a/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
new file mode 100644
index 000000000000..190483c09723
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_notifications_message__center__notification__manager.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/notifications/message_center_notification_manager.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/notifications/message_center_notification_manager.cc
+@@ -75,7 +75,7 @@ MessageCenterNotificationManager::Messag
+       new FullscreenNotificationBlocker(message_center)));
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) \
+-  || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++  || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // On Windows, Linux and Mac, the notification manager owns the tray icon and
+   // views.Other platforms have global ownership and Create will return NULL.
+   tray_.reset(message_center::CreateMessageCenterTray());
diff --git a/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
new file mode 100644
index 000000000000..e32bc8b3474c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_password__manager_chrome__password__manager__client.cc
@@ -0,0 +1,14 @@
+--- chrome/browser/password_manager/chrome_password_manager_client.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/password_manager/chrome_password_manager_client.cc
+@@ -56,7 +56,11 @@
+ #include "content/public/browser/web_contents.h"
+ #include "google_apis/gaia/gaia_urls.h"
+ #include "net/base/url_util.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ #if defined(OS_MACOSX) || BUILDFLAG(ANDROID_JAVA_UI)
+ #include "chrome/browser/password_manager/save_password_infobar_delegate.h"
diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
new file mode 100644
index 000000000000..c876b478b8b9
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/plugins/plugins_resource_service.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/plugins/plugins_resource_service.cc
+@@ -31,7 +31,7 @@ GURL GetPluginsServerURL() {
+   std::string filename;
+ #if defined(OS_WIN)
+   filename = "plugins_win.json";
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   filename = "plugins_linux.json";
+ #elif defined(OS_MACOSX)
+   filename = "plugins_mac.json";
diff --git a/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
new file mode 100644
index 000000000000..479342c467ca
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_policy_policy__prefs__browsertest.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/policy/policy_prefs_browsertest.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/policy/policy_prefs_browsertest.cc
+@@ -174,6 +174,8 @@ class PolicyTestCase {
+     const std::string os("chromeos");
+ #elif defined(OS_LINUX)
+     const std::string os("linux");
++#elif defined(OS_FREEBSD)
++    const std::string os("freebsd");
+ #else
+ #error "Unknown platform"
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
new file mode 100644
index 000000000000..995da03d3a6d
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -0,0 +1,34 @@
+--- chrome/browser/process_singleton_posix.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/process_singleton_posix.cc
+@@ -87,11 +87,11 @@
+ #include "net/base/network_interfaces.h"
+ #include "ui/base/l10n/l10n_util.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/ui/process_singleton_dialog_linux.h"
+ #endif
+ 
+-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+ 
+@@ -315,7 +315,7 @@ bool DisplayProfileInUseError(const base
+   if (g_disable_prompt)
+     return false;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::string16 relaunch_button_text = l10n_util::GetStringUTF16(
+       IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
+   return ShowProcessSingletonDialog(error, relaunch_button_text);
+@@ -869,7 +869,7 @@ ProcessSingleton::NotifyResult ProcessSi
+     // The other process is shutting down, it's safe to start a new process.
+     return PROCESS_NONE;
+   } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) {
+-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     // Likely NULL in unit tests.
+     views::LinuxUI* linux_ui = views::LinuxUI::instance();
+     if (linux_ui)
diff --git a/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
new file mode 100644
index 000000000000..0ec2d3156f45
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -0,0 +1,38 @@
+--- chrome/browser/renderer_preferences_util.cc.orig	2016-05-11 19:02:14 UTC
++++ chrome/browser/renderer_preferences_util.cc
+@@ -15,7 +15,7 @@
+ #include "content/public/common/webrtc_ip_handling_policy.h"
+ #include "third_party/skia/include/core/SkColor.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
+ #include "ui/gfx/font_render_params.h"
+ #endif
+ 
+@@ -27,7 +27,7 @@
+ #include "ui/views/controls/textfield/textfield.h"
+ #endif
+ 
+-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+ #include "chrome/browser/themes/theme_service.h"
+ #include "chrome/browser/themes/theme_service_factory.h"
+ #include "ui/views/linux_ui/linux_ui.h"
+@@ -95,7 +95,7 @@ void UpdateFromSystemSettings(content::R
+   prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0;
+ #endif
+ 
+-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+   views::LinuxUI* linux_ui = views::LinuxUI::instance();
+   if (linux_ui) {
+     if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
+@@ -117,7 +117,7 @@ void UpdateFromSystemSettings(content::R
+   }
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN)
++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
+   CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params,
+       (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(), NULL)));
+   prefs->should_antialias_text = params.antialiasing;
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
new file mode 100644
index 000000000000..48cab205d74b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__handler__util.cc
@@ -0,0 +1,15 @@
+--- chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc.orig	2016-03-25 13:04:45 UTC
++++ chrome/browser/safe_browsing/incident_reporting/incident_handler_util.cc
+@@ -8,7 +8,12 @@
+ 
+ #include "base/hash.h"
+ #include "base/logging.h"
++//XXX(rene) needs shim headers?
++#if defined(USE_SYSTEM_PROTOBUF)
++#include <google/protobuf/message_lite.h>
++#else
+ #include "third_party/protobuf/src/google/protobuf/message_lite.h"
++#endif
+ 
+ namespace safe_browsing {
+ 
diff --git a/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc
new file mode 100644
index 000000000000..5c23af3d22c2
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_search_local__files__ntp__source.cc
@@ -0,0 +1,16 @@
+--- chrome/browser/search/local_files_ntp_source.cc.orig	2016-05-11 19:02:15 UTC
++++ chrome/browser/search/local_files_ntp_source.cc
+@@ -19,8 +19,13 @@
+ #include "chrome/common/url_constants.h"
+ #include "content/public/browser/browser_thread.h"
+ #include "content/public/browser/url_data_source.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#include <re2/stringpiece.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
+ #include "third_party/re2/src/re2/stringpiece.h"
++#endif
+ 
+ namespace {
+ 
diff --git a/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
new file mode 100644
index 000000000000..ba4b7fb79f9f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_sync_chrome__sync__client.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/sync/chrome_sync_client.cc.orig	2016-05-11 19:02:15 UTC
++++ chrome/browser/sync/chrome_sync_client.cc
+@@ -554,7 +554,7 @@ void ChromeSyncClient::RegisterDesktopDa
+   }
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)
++#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS) || defined(OS_BSD)
+   // Dictionary sync is enabled by default.
+   if (!disabled_types.Has(syncer::DICTIONARY)) {
+     sync_service->RegisterDataTypeController(new UIDataTypeController(
diff --git a/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
new file mode 100644
index 000000000000..6006d9827f1d
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_tracing_crash__service__uploader.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/tracing/crash_service_uploader.cc.orig	2016-05-11 19:02:15 UTC
++++ chrome/browser/tracing/crash_service_uploader.cc
+@@ -150,6 +150,8 @@ void TraceCrashServiceUploader::DoUpload
+   const char product[] = "Chrome_Android";
+ #elif defined(OS_CHROMEOS)
+   const char product[] = "Chrome_ChromeOS";
++#elif defined(OS_FREEBSD)
++  const char product[] = "Chrome_FreeBSD";
+ #else
+ #error Platform not supported.
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
new file mode 100644
index 000000000000..02878c156b89
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -0,0 +1,38 @@
+--- chrome/browser/ui/browser_command_controller.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/browser_command_controller.cc
+@@ -77,7 +77,7 @@
+ #include "chrome/browser/ui/browser_commands_chromeos.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
+ #endif
+ 
+@@ -221,7 +221,7 @@ bool BrowserCommandController::IsReserve
+   if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN)
+     return true;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // If this key was registered by the user as a content editing hotkey, then
+   // it is not reserved.
+   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
+@@ -414,7 +414,7 @@ void BrowserCommandController::ExecuteCo
+       break;
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     case IDC_USE_SYSTEM_TITLE_BAR: {
+       PrefService* prefs = browser_->profile()->GetPrefs();
+       prefs->SetBoolean(prefs::kUseCustomChromeFrame,
+@@ -815,7 +815,7 @@ void BrowserCommandController::InitComma
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true);
+   command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true);
+ #endif
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true);
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
new file mode 100644
index 000000000000..c6938e080f49
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__view__prefs.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/browser_view_prefs.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/browser_view_prefs.cc
+@@ -10,7 +10,7 @@
+ #include "components/prefs/pref_registry_simple.h"
+ #include "components/prefs/pref_service.h"
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+ #include "ui/base/x/x11_util.h"
+ #endif
+ 
+@@ -43,7 +43,7 @@ void RegisterBrowserViewLocalPrefs(PrefR
+ void RegisterBrowserViewProfilePrefs(
+     user_prefs::PrefRegistrySyncable* registry) {
+   bool custom_frame_default = false;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+   custom_frame_default = ui::GetCustomFramePrefDefault();
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
new file mode 100644
index 000000000000..be0484a5b919
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_exclusive__access_exclusive__access__bubble.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc.orig	2016-04-08 16:02:07 UTC
++++ chrome/browser/ui/exclusive_access/exclusive_access_bubble.cc
+@@ -19,7 +19,7 @@
+ 
+ // NOTE(koz): Linux doesn't use the thick shadowed border, so we add padding
+ // here.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const int ExclusiveAccessBubble::kPaddingPx = 8;
+ #else
+ const int ExclusiveAccessBubble::kPaddingPx = 15;
diff --git a/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
new file mode 100644
index 000000000000..24bb5fcf48bf
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_input__method_input__method__engine__base.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/input_method/input_method_engine_base.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/input_method/input_method_engine_base.cc
+@@ -35,7 +35,7 @@
+ #elif defined(OS_WIN)
+ #include "ui/events/keycodes/dom/keycode_converter.h"
+ #include "ui/events/keycodes/keyboard_codes_win.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/events/keycodes/dom/keycode_converter.h"
+ #include "ui/events/keycodes/keyboard_codes_posix.h"
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc b/www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc
new file mode 100644
index 000000000000..665d64fd4d15
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_panels_panel__manager.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/panels/panel_manager.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/panels/panel_manager.cc
+@@ -142,7 +142,7 @@ bool PanelManager::ShouldUsePanels(const
+ // static
+ bool PanelManager::IsPanelStackingEnabled() {
+   // Stacked panel mode is not supported in linux-aura.
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   return false;
+ #else
+   return true;
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
new file mode 100644
index 000000000000..f0aed62065ba
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/startup/startup_browser_creator.cc
+@@ -88,7 +88,7 @@
+ #include "components/user_manager/user_manager.h"
+ #endif
+ 
+-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX)
++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD))
+ #include "ui/events/devices/x11/touch_factory_x11.h"
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
new file mode 100644
index 000000000000..8747a5b389c9
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_toolbar_app__menu__model.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/toolbar/app_menu_model.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/toolbar/app_menu_model.cc
+@@ -709,7 +709,7 @@ bool AppMenuModel::IsCommandIdVisible(in
+     case IDC_UPGRADE_DIALOG:
+       return browser_defaults::kShowUpgradeMenuItem &&
+           UpgradeDetector::GetInstance()->notify_upgrade();
+-#if !defined(OS_LINUX) || defined(USE_AURA)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
+     case IDC_BOOKMARK_PAGE:
+       return !chrome::ShouldRemoveBookmarkThisPageUI(browser_->profile());
+     case IDC_BOOKMARK_ALL_TABS:
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
new file mode 100644
index 000000000000..2768c1e9ee38
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
+@@ -20,7 +20,7 @@
+ #include "ui/gfx/image/image_skia.h"
+ #include "ui/views/widget/widget.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/shell_integration_linux.h"
+ #endif
+ 
+@@ -58,7 +58,7 @@ void ChromeNativeAppWindowViewsAura::OnB
+     const AppWindow::CreateParams& create_params,
+     views::Widget::InitParams* init_params,
+     views::Widget* widget) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
+       app_window()->extension_id());
+   // Set up a custom WM_CLASS for app windows. This allows task switchers in
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
new file mode 100644
index 000000000000..bad7a92b4b5f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/ui/views/chrome_views_delegate.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/chrome_views_delegate.cc
+@@ -48,7 +48,7 @@
+ #include "ui/views/widget/native_widget_aura.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+ 
+@@ -295,7 +295,7 @@ HICON ChromeViewsDelegate::GetSmallWindo
+   return GetSmallAppIcon();
+ }
+ 
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
+   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+   return rb.GetImageSkiaNamed(IDR_PRODUCT_LOGO_64);
+@@ -443,7 +443,7 @@ void ChromeViewsDelegate::OnBeforeWidget
+ #endif
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS)  || defined(OS_BSD)
+ bool ChromeViewsDelegate::WindowManagerProvidesTitleBar(bool maximized) {
+   // On Ubuntu Unity, the system always provides a title bar for maximized
+   // windows.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
new file mode 100644
index 000000000000..f34b13e2d183
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/chrome_views_delegate.h
+@@ -35,7 +35,7 @@ class ChromeViewsDelegate : public views
+ #if defined(OS_WIN)
+   HICON GetDefaultWindowIcon() const override;
+   HICON GetSmallWindowIcon() const override;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   gfx::ImageSkia* GetDefaultWindowIcon() const override;
+ #endif
+ 
+@@ -48,7 +48,7 @@ class ChromeViewsDelegate : public views
+   void OnBeforeWidgetInit(
+       views::Widget::InitParams* params,
+       views::internal::NativeWidgetDelegate* delegate) override;
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   bool WindowManagerProvidesTitleBar(bool maximized) override;
+ #endif
+   ui::ContextFactory* GetContextFactory() override;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
new file mode 100644
index 000000000000..c9743fc43d89
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/first_run_dialog.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/first_run_dialog.cc
+@@ -114,12 +114,16 @@ views::View* FirstRunDialog::CreateExtra
+ bool FirstRunDialog::Accept() {
+   GetWidget()->Hide();
+ 
++#if !defined(OS_BSD)
+   if (report_crashes_ && report_crashes_->checked()) {
+     if (GoogleUpdateSettings::SetCollectStatsConsent(true))
+       breakpad::InitCrashReporter(std::string());
+-  } else {
++  } else
++#else
++  {
+     GoogleUpdateSettings::SetCollectStatsConsent(false);
+   }
++#endif
+ 
+   if (make_default_ && make_default_->checked())
+     shell_integration::SetAsDefaultBrowser();
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
new file mode 100644
index 000000000000..d55e1ec4112d
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/frame/browser_frame.cc
+@@ -36,7 +36,7 @@
+ #include "ui/native_theme/native_theme_dark_aura.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "chrome/browser/ui/views/frame/browser_command_handler_linux.h"
+ #endif
+ 
+@@ -88,7 +88,7 @@ void BrowserFrame::InitBrowserFrame() {
+     non_client_view()->set_context_menu_controller(this);
+   }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   browser_command_handler_.reset(new BrowserCommandHandlerLinux(browser_view_));
+ #endif
+ }
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
new file mode 100644
index 000000000000..77e6c8fe5208
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/browser_view.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/frame/browser_view.cc
+@@ -187,7 +187,7 @@
+ #include "content/public/common/mojo_shell_connection.h"
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/native_theme/native_theme_dark_aura.h"
+ #endif
+ 
+@@ -2017,7 +2017,7 @@ void BrowserView::OnThemeChanged() {
+ #if defined(OS_WIN)
+     ui::NativeThemeDarkWin::instance()->NotifyObservers();
+     ui::NativeThemeWin::instance()->NotifyObservers();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+     ui::NativeThemeDarkAura::instance()->NotifyObservers();
+     ui::NativeThemeAura::instance()->NotifyObservers();
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
new file mode 100644
index 000000000000..3f0f575100ce
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+@@ -53,7 +53,7 @@
+ #include "ui/views/window/frame_background.h"
+ #include "ui/views/window/window_shape.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/views/controls/menu/menu_runner.h"
+ #endif
+ 
+@@ -311,7 +311,7 @@ void OpaqueBrowserFrameView::ButtonPress
+ void OpaqueBrowserFrameView::OnMenuButtonClicked(views::MenuButton* source,
+                                                  const gfx::Point& point,
+                                                  const ui::Event* event) {
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   views::MenuRunner menu_runner(frame()->GetSystemMenuModel(),
+                                 views::MenuRunner::HAS_MNEMONICS);
+   ignore_result(menu_runner.RunMenuAt(browser_view()->GetWidget(),
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
new file mode 100644
index 000000000000..58cd5617849b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__layout.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc
+@@ -20,7 +20,7 @@ namespace {
+ 
+ const int kCaptionButtonHeight = 18;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ // Default extra space between the top of the frame and the top of the window
+ // caption buttons.
+ const int kExtraCaption = 2;
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
new file mode 100644
index 000000000000..f60c0d4824ba
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view__platform__specific.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc.orig	2016-04-08 16:02:08 UTC
++++ chrome/browser/ui/views/frame/opaque_browser_frame_view_platform_specific.cc
+@@ -10,7 +10,7 @@ bool OpaqueBrowserFrameViewPlatformSpeci
+   return false;
+ }
+ 
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
+ 
+ // static
+ OpaqueBrowserFrameViewPlatformSpecific*
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
new file mode 100644
index 000000000000..4e338761cf84
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
+@@ -88,7 +88,7 @@ void SystemMenuModelBuilder::BuildSystem
+     model->AddSeparator(ui::NORMAL_SEPARATOR);
+     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+   }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   model->AddSeparator(ui::NORMAL_SEPARATOR);
+   model->AddCheckItemWithStringId(IDC_USE_SYSTEM_TITLE_BAR,
+                                   IDS_SHOW_WINDOW_DECORATIONS_MENU);
+@@ -126,7 +126,7 @@ void SystemMenuModelBuilder::BuildSystem
+     model->AddSeparator(ui::NORMAL_SEPARATOR);
+     model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER);
+   }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   model->AddSeparator(ui::NORMAL_SEPARATOR);
+   model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE);
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc
new file mode 100644
index 000000000000..c04ed621e67f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_message__center_message__center__frame__view.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/message_center/message_center_frame_view.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/message_center/message_center_frame_view.cc
+@@ -15,7 +15,7 @@
+ namespace message_center {
+ 
+ MessageCenterFrameView::MessageCenterFrameView() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   const int kBorderWidth = 1;
+   SetBorder(views::Border::CreateSolidBorder(
+       kBorderWidth, message_center::kMessageCenterBorderColor));
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc
new file mode 100644
index 000000000000..16262f47bce8
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_panels_panel__frame__view.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/panels/panel_frame_view.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/panels/panel_frame_view.cc
+@@ -589,7 +589,7 @@ bool PanelFrameView::OnMousePressed(cons
+ }
+ 
+ bool PanelFrameView::OnMouseDragged(const ui::MouseEvent& event) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Converting the mouse location to screen coordinates returns an incorrect
+   // location while the panel is moving. See crbug.com/353393 for more details.
+   // TODO(pkotwicz): Fix conversion to screen coordinates
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
new file mode 100644
index 000000000000..d4d6c5bed77a
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -0,0 +1,29 @@
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
+@@ -268,7 +268,7 @@ void TabDragController::Init(
+   //     synchronous on desktop Linux, so use that.
+   // - Ash
+   //     Releasing capture on Ash cancels gestures so avoid it.
+-#if defined(OS_LINUX) || defined(USE_ASH)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(USE_ASH)
+   can_release_capture_ = false;
+ #endif
+   start_point_in_screen_ = gfx::Point(source_tab_offset, mouse_offset.y());
+@@ -618,7 +618,7 @@ TabDragController::DragBrowserToNewTabSt
+     // that to effect the position of any windows.
+     SetWindowPositionManaged(browser_widget->GetNativeWindow(), false);
+ 
+-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+     // EndMoveLoop is going to snap the window back to its original location.
+     // Hide it so users don't see this. Hiding a window in Linux aura causes
+     // it to lose capture so skip it.
+@@ -1791,7 +1791,7 @@ gfx::NativeWindow TabDragController::Get
+     if (dragged_window)
+       exclude.insert(dragged_window);
+   }
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   // Exclude windows which are pending deletion via Browser::TabStripEmpty().
+   // These windows can be returned in the Linux Aura port because the browser
+   // window which was used for dragging is not hidden once all of its tabs are
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
new file mode 100644
index 000000000000..d073704a674c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__strip.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/tabs/tab_strip.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/views/tabs/tab_strip.cc
+@@ -333,7 +333,7 @@ NewTabButton::NewTabButton(TabStrip* tab
+     : views::ImageButton(listener),
+       tab_strip_(tab_strip),
+       destroyed_(NULL) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+   set_triggerable_event_flags(triggerable_event_flags() |
+                               ui::EF_MIDDLE_MOUSE_BUTTON);
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
new file mode 100644
index 000000000000..7b9077ae0b3f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_about__ui.cc
@@ -0,0 +1,54 @@
+--- chrome/browser/ui/webui/about_ui.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/webui/about_ui.cc
+@@ -74,7 +74,7 @@
+ #include "chrome/browser/ui/webui/theme_source.h"
+ #endif
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "content/public/browser/zygote_host_linux.h"
+ #include "content/public/common/sandbox_linux.h"
+ #endif
+@@ -707,7 +707,7 @@ void FinishMemoryDataRequest(
+   }
+ }
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ std::string AboutLinuxProxyConfig() {
+   std::string data;
+   AppendHeader(&data, 0,
+@@ -723,6 +723,7 @@ std::string AboutLinuxProxyConfig() {
+   return data;
+ }
+ 
++#if !defined(OS_BSD)
+ void AboutSandboxRow(std::string* data, int name_id, bool good) {
+   data->append("<tr><td>");
+   data->append(l10n_util::GetStringUTF8(name_id));
+@@ -791,6 +792,7 @@ std::string AboutSandbox() {
+   return data;
+ }
+ #endif
++#endif
+ 
+ // AboutMemoryHandler ----------------------------------------------------------
+ 
+@@ -963,7 +965,7 @@ void AboutUIHTMLSource::StartDataRequest
+   } else if (source_name_ == chrome::kChromeUIDNSHost) {
+     AboutDnsHandler::Start(profile(), callback);
+     return;
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   } else if (source_name_ == chrome::kChromeUILinuxProxyConfigHost) {
+     response = AboutLinuxProxyConfig();
+ #endif
+@@ -977,7 +979,7 @@ void AboutUIHTMLSource::StartDataRequest
+     ChromeOSCreditsHandler::Start(path, callback);
+     return;
+ #endif
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_FREEBSD)
+   } else if (source_name_ == chrome::kChromeUISandboxHost) {
+     response = AboutSandbox();
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
new file mode 100644
index 000000000000..a253d91eafaa
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+@@ -275,7 +275,7 @@ bool IsAboutUI(const GURL& url) {
+ #if !defined(OS_ANDROID)
+           || url.host() == chrome::kChromeUITermsHost
+ #endif
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+           || url.host() == chrome::kChromeUILinuxProxyConfigHost ||
+           url.host() == chrome::kChromeUISandboxHost
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc
new file mode 100644
index 000000000000..66becbeaf2b2
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_extensions_extension__loader__handler.cc
@@ -0,0 +1,14 @@
+--- chrome/browser/ui/webui/extensions/extension_loader_handler.cc.orig	2016-05-11 19:02:16 UTC
++++ chrome/browser/ui/webui/extensions/extension_loader_handler.cc
+@@ -25,7 +25,11 @@
+ #include "extensions/common/constants.h"
+ #include "extensions/common/extension.h"
+ #include "extensions/common/manifest_constants.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "ui/base/l10n/l10n_util.h"
+ 
+ namespace extensions {
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
new file mode 100644
index 000000000000..d321230278d7
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.cc
@@ -0,0 +1,45 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/browser/ui/webui/options/browser_options_handler.cc
+@@ -491,13 +491,13 @@ void BrowserOptionsHandler::GetLocalized
+     { "syncButtonTextStart", IDS_SYNC_SETUP_BUTTON_LABEL },
+ #endif  // defined(OS_CHROMEOS)
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+     { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS },
+     { "themesNativeButton", IDS_THEMES_GTK_BUTTON },
+     { "themesSetClassic", IDS_THEMES_SET_CLASSIC },
+ #else
+     { "themes", IDS_THEMES_GROUP_NAME },
+-#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#endif  // defined(OS_POSIX) && !defined(OS_CHROMEOS)
+ 
+ #if defined(OS_CHROMEOS) && defined(USE_ASH)
+     { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
+@@ -738,7 +738,7 @@ void BrowserOptionsHandler::RegisterMess
+       "requestProfilesInfo",
+       base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo,
+                  base::Unretained(this)));
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+   web_ui()->RegisterMessageCallback(
+       "themesSetNative",
+       base::Bind(&BrowserOptionsHandler::ThemesSetNative,
+@@ -1366,7 +1366,7 @@ void BrowserOptionsHandler::ObserveTheme
+   ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile);
+   bool is_system_theme = false;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+   bool profile_is_supervised = profile->IsSupervised();
+   is_system_theme = theme_service->UsingSystemTheme();
+   base::FundamentalValue native_theme_enabled(!is_system_theme &&
+@@ -1388,7 +1388,7 @@ void BrowserOptionsHandler::ThemesReset(
+   ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme();
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+ void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) {
+   content::RecordAction(UserMetricsAction("Options_GtkThemeSet"));
+   Profile* profile = Profile::FromWebUI(web_ui());
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
new file mode 100644
index 000000000000..bf9abb470a7c
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_options_browser__options__handler.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/webui/options/browser_options_handler.h.orig	2016-05-11 19:02:17 UTC
++++ chrome/browser/ui/webui/options/browser_options_handler.h
+@@ -204,7 +204,7 @@ class BrowserOptionsHandler
+ 
+   void ObserveThemeChanged();
+   void ThemesReset(const base::ListValue* args);
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_POSIX) && !defined(OS_CHROMEOS)
+   void ThemesSetNative(const base::ListValue* args);
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
new file mode 100644
index 000000000000..caf13d17488d
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/web_app.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/browser/web_applications/web_app.cc
+@@ -514,7 +514,7 @@ void GetIconsInfo(const WebApplicationIn
+ }
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ std::string GetWMClassFromAppName(std::string app_name) {
+   base::i18n::ReplaceIllegalCharactersInPath(&app_name, '_');
+   base::TrimString(app_name, "_", &app_name);
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app.h b/www/chromium/files/patch-chrome_browser_web__applications_web__app.h
new file mode 100644
index 000000000000..3c9be81784de
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app.h
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/web_app.h.orig	2016-05-11 19:02:17 UTC
++++ chrome/browser/web_applications/web_app.h
+@@ -227,7 +227,7 @@ typedef std::vector<WebApplicationInfo::
+ void GetIconsInfo(const WebApplicationInfo& app_info, IconInfoList* icons);
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // Windows that correspond to web apps need to have a deterministic (and
+ // different) WMClass than normal chrome windows so the window manager groups
+ // them as a separate application.
diff --git a/www/chromium/files/patch-chrome_chrome__browser.gypi b/www/chromium/files/patch-chrome_chrome__browser.gypi
new file mode 100644
index 000000000000..d70df1435b70
--- /dev/null
+++ b/www/chromium/files/patch-chrome_chrome__browser.gypi
@@ -0,0 +1,51 @@
+--- chrome/chrome_browser.gypi.orig	2016-05-11 19:02:17 UTC
++++ chrome/chrome_browser.gypi
+@@ -3638,7 +3638,7 @@
+             '../device/media_transfer_protocol/media_transfer_protocol.gyp:device_media_transfer_protocol',
+           ],
+         }],
+-        ['OS=="linux" and chromeos==0', {
++        ['(OS=="linux" and chromeos==0) or os_bsd==1', {
+           'dependencies': [
+             '../build/linux/system.gyp:libspeechd',
+           ],
+@@ -3702,7 +3702,7 @@
+         ['use_x11==1', {
+           'sources': [ '<@(chrome_browser_x11_sources)' ],
+         }],
+-        ['os_posix == 1 and OS != "mac" and OS != "ios"', {
++        ['os_posix == 1 and OS != "mac" and OS != "ios" and os_bsd != 1', {
+           'sources': [
+             'app/chrome_crash_reporter_client.cc',
+             'app/chrome_crash_reporter_client.h',
+@@ -3834,6 +3834,12 @@
+             }],
+           ],
+         }],
++        ['os_bsd==1', {
++          'sources/': [
++            ['exclude', '^browser/media_galleries/linux/'],
++            ['exclude', '^browser/memory/system_memory_stats_recorder_linux.cc'],
++          ],
++        }],
+         ['OS=="mac"', {
+           'dependencies': [
+             '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:google_toolbox_for_mac',
+@@ -3943,7 +3949,7 @@
+             }],
+           ],
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or os_bsd==1', {
+           'conditions': [
+             ['use_aura==1', {
+               'dependencies': [
+@@ -3962,7 +3968,7 @@
+             }],
+           ],
+         }],
+-        ['OS=="linux" or OS=="win"', {
++        ['OS=="linux" or OS=="win" or os_bsd==1', {
+             'sources': [ '<@(chrome_browser_non_mac_desktop_sources)' ],
+         }],
+         ['desktop_linux==1', {
diff --git a/www/chromium/files/patch-chrome_chrome__browser__extensions.gypi b/www/chromium/files/patch-chrome_chrome__browser__extensions.gypi
new file mode 100644
index 000000000000..f61e29c46d92
--- /dev/null
+++ b/www/chromium/files/patch-chrome_chrome__browser__extensions.gypi
@@ -0,0 +1,23 @@
+--- chrome/chrome_browser_extensions.gypi.orig	2016-05-25 15:00:58.000000000 -0400
++++ chrome/chrome_browser_extensions.gypi	2016-05-27 09:56:46.969693000 -0400
+@@ -1019,6 +1019,11 @@
+             '<@(chrome_browser_extensions_task_manager_enabled_sources)',
+           ],
+         }],
++        ['os_bsd==1', {
++          'sources/': [
++            ['exclude', '^browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc'],
++          ],
++        }],
+         ['chromeos==1', {
+           'dependencies': [
+             '../build/linux/system.gyp:dbus',
+@@ -1061,7 +1066,7 @@
+             '../ui/views/views.gyp:views',
+           ],
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or os_bsd==1', {
+           'conditions': [
+             ['use_aura==1', {
+               'dependencies': [
diff --git a/www/chromium/files/patch-chrome_chrome__browser__ui.gypi b/www/chromium/files/patch-chrome_chrome__browser__ui.gypi
new file mode 100644
index 000000000000..2528ba595138
--- /dev/null
+++ b/www/chromium/files/patch-chrome_chrome__browser__ui.gypi
@@ -0,0 +1,20 @@
+--- chrome/chrome_browser_ui.gypi.orig	2016-05-11 19:02:17 UTC
++++ chrome/chrome_browser_ui.gypi
+@@ -3069,7 +3069,7 @@
+             }],
+           ],
+         }],
+-        ['use_aura==1 and chromeos==0 and use_ozone==0 and OS=="linux"', {
++        ['use_aura==1 and chromeos==0 and use_ozone==0 and (OS=="linux" or OS=="freebsd" or OS=="openbsd")', {
+           'dependencies': [
+             # gtk2 is the only component that can interact with gtk2 in our new
+             # world.
+@@ -3251,7 +3251,7 @@
+           ],
+           'sources': [ '<@(chrome_browser_ui_desktop_linux_sources)' ],
+         }],
+-        ['OS=="linux"', {  # Both desktop Linux and ChromeOS.
++        ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {  # Both desktop Linux and ChromeOS.
+           'sources': [ '<@(chrome_browser_ui_linux_sources)' ],
+           'conditions': [
+             ['use_aura==1', {
diff --git a/www/chromium/files/patch-chrome_chrome__common.gypi b/www/chromium/files/patch-chrome_chrome__common.gypi
new file mode 100644
index 000000000000..d3a66f9330f4
--- /dev/null
+++ b/www/chromium/files/patch-chrome_chrome__common.gypi
@@ -0,0 +1,22 @@
+--- chrome/chrome_common.gypi.orig	2016-05-11 19:02:17 UTC
++++ chrome/chrome_common.gypi
+@@ -30,8 +30,8 @@
+       'common/common_param_traits.cc',
+       'common/common_param_traits.h',
+       'common/common_param_traits_macros.h',
+-      'common/component_flash_hint_file_linux.cc',
+-      'common/component_flash_hint_file_linux.h',
++#      'common/component_flash_hint_file_linux.cc',
++#      'common/component_flash_hint_file_linux.h',
+       'common/content_restriction.h',
+       'common/content_settings_pattern_serializer.cc',
+       'common/content_settings_pattern_serializer.h',
+@@ -381,7 +381,7 @@
+             ['chromeos==1', {
+               'sources': [ '<@(chrome_common_extensions_chromeos_sources)' ],
+             }],
+-            ['OS=="win" or OS=="linux"', {
++            ['OS=="win" or OS=="linux" or os_bsd==1', {
+               'sources': [
+                 'common/extensions/api/input_ime/input_components_handler.cc',
+                 'common/extensions/api/input_ime/input_components_handler.h',
diff --git a/www/chromium/files/patch-chrome_chrome__exe.gypi b/www/chromium/files/patch-chrome_chrome__exe.gypi
new file mode 100644
index 000000000000..5867458ff063
--- /dev/null
+++ b/www/chromium/files/patch-chrome_chrome__exe.gypi
@@ -0,0 +1,11 @@
+--- chrome/chrome_exe.gypi.orig	2016-05-11 19:02:17 UTC
++++ chrome/chrome_exe.gypi
+@@ -182,7 +182,7 @@
+                 '../build/linux/system.gyp:xext',
+               ],
+             }],
+-            ['OS=="linux" and enable_plugins==1', {
++            ['(OS=="linux" or os_bsd==1) and enable_plugins==1', {
+               'dependencies': [
+                 '../pdf/pdf.gyp:pdf',
+               ],
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
new file mode 100644
index 000000000000..8ef25950c031
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -0,0 +1,53 @@
+--- chrome/common/chrome_paths.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/common/chrome_paths.cc
+@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePat
+         return false;
+       break;
+     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+       if (!GetUserDownloadsDirectorySafe(&cur))
+         return false;
+       break;
+@@ -470,10 +470,12 @@ bool PathProvider(int key, base::FilePat
+       if (!base::PathExists(cur))  // We don't want to create this
+         return false;
+       break;
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
++#if defined(OS_POSIX) && !defined(OS_MACOSX)
+     case chrome::DIR_POLICY_FILES: {
+ #if defined(GOOGLE_CHROME_BUILD)
+       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
++#elif defined(OS_BSD)
++      cur = base::FilePath(FILE_PATH_LITERAL("/usr/local/etc/chrome/policies"));
+ #else
+       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
+ #endif
+@@ -540,7 +542,7 @@ bool PathProvider(int key, base::FilePat
+ #endif
+       break;
+ 
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+     case chrome::DIR_NATIVE_MESSAGING:
+ #if defined(OS_MACOSX)
+ #if defined(GOOGLE_CHROME_BUILD)
+@@ -554,6 +556,9 @@ bool PathProvider(int key, base::FilePat
+ #if defined(GOOGLE_CHROME_BUILD)
+       cur = base::FilePath(FILE_PATH_LITERAL(
+           "/etc/opt/chrome/native-messaging-hosts"));
++#elif defined(OS_BSD)
++      cur = base::FilePath(FILE_PATH_LITERAL(
++          "/usr/local/etc/chrome/native-messaging-hosts"));
+ #else
+       cur = base::FilePath(FILE_PATH_LITERAL(
+           "/etc/chromium/native-messaging-hosts"));
+@@ -566,7 +571,7 @@ bool PathProvider(int key, base::FilePat
+         return false;
+       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
+       break;
+-#endif  // defined(OS_LINUX) || defined(OS_MACOSX)
++#endif  // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ #if !defined(OS_ANDROID)
+     case chrome::DIR_GLOBAL_GCM_STORE:
+       if (!PathService::Get(chrome::DIR_USER_DATA, &cur))
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
new file mode 100644
index 000000000000..f765f38bcf26
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -0,0 +1,29 @@
+--- chrome/common/chrome_paths.h.orig	2016-05-11 19:02:17 UTC
++++ chrome/common/chrome_paths.h
+@@ -50,7 +50,7 @@ enum {
+   DIR_USER_APPLICATIONS,        // ~/Applications
+   DIR_USER_LIBRARY,             // ~/Library
+ #endif
+-#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && defined(CHROMIUM_BUILD)) || \
++#if defined(OS_CHROMEOS) || ((defined(OS_LINUX) || defined(OS_BSD)) && defined(CHROMIUM_BUILD)) || \
+     defined(OS_MACOSX)
+   DIR_USER_EXTERNAL_EXTENSIONS,  // Directory for per-user external extensions
+                                  // on Chrome Mac and Chromium Linux.
+@@ -59,7 +59,7 @@ enum {
+                                  // create it.
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   DIR_STANDALONE_EXTERNAL_EXTENSIONS,  // Directory for 'per-extension'
+                                        // definition manifest files that
+                                        // describe extensions which are to be
+@@ -117,7 +117,7 @@ enum {
+   DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,  // Directory where sanitized
+                                              // supervised user whitelists are
+                                              // installed.
+-#if defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
+   DIR_NATIVE_MESSAGING,         // System directory where native messaging host
+                                 // manifest files are stored.
+   DIR_USER_NATIVE_MESSAGING,    // Directory with Native Messaging Hosts
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths__internal.h b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
new file mode 100644
index 000000000000..55e9c6cafb51
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_chrome__paths__internal.h
@@ -0,0 +1,11 @@
+--- chrome/common/chrome_paths_internal.h.orig	2016-05-11 19:02:17 UTC
++++ chrome/common/chrome_paths_internal.h
+@@ -39,7 +39,7 @@ void GetUserCacheDirectory(const base::F
+ // Get the path to the user's documents directory.
+ bool GetUserDocumentsDirectory(base::FilePath* result);
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ // Gets the path to a safe default download directory for a user.
+ bool GetUserDownloadsDirectorySafe(base::FilePath* result);
+ #endif
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
new file mode 100644
index 000000000000..3050c72e4ca8
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -0,0 +1,11 @@
+--- chrome/common/chrome_switches.cc.orig	2016-05-25 15:00:58.000000000 -0400
++++ chrome/common/chrome_switches.cc	2016-05-27 09:57:28.188798000 -0400
+@@ -1298,7 +1298,7 @@
+     "tab-management-experiment-type-elderberry";
+ #endif  // defined(OS_ANDROID)
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ extern const char kEnableInputImeAPI[] = "enable-input-ime-api";
+ extern const char kDisableInputImeAPI[] = "disable-input-ime-api";
+ #endif
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
new file mode 100644
index 000000000000..af129c7b4187
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -0,0 +1,11 @@
+--- chrome/common/chrome_switches.h.orig	2016-05-25 15:00:58.000000000 -0400
++++ chrome/common/chrome_switches.h	2016-05-27 10:00:47.232609000 -0400
+@@ -387,7 +387,7 @@
+ extern const char kEnableWaylandServer[];
+ #endif
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+ extern const char kEnableInputImeAPI[];
+ extern const char kDisableInputImeAPI[];
+ #endif
diff --git a/www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h b/www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h
new file mode 100644
index 000000000000..fb12a692064b
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_component__flash__hint__file__linux.h
@@ -0,0 +1,14 @@
+--- chrome/common/component_flash_hint_file_linux.h.orig	2016-03-25 13:04:46 UTC
++++ chrome/common/component_flash_hint_file_linux.h
+@@ -7,9 +7,9 @@
+ 
+ #include "build/build_config.h"
+ 
+-#if !defined(OS_LINUX)
++#if !defined(OS_LINUX) && !defined(OS_FREEBSD)
+ #error "This file only applies to the Linux component update of Flash."
+-#endif  // !defined(OS_LINUX)
++#endif  // !defined(OS_LINUX) && !defined(OS_FREEBSD)
+ 
+ #include <string>
+ 
diff --git a/www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi b/www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi
new file mode 100644
index 000000000000..af23228570f1
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_extensions_api_schemas.gypi
@@ -0,0 +1,11 @@
+--- chrome/common/extensions/api/schemas.gypi.orig	2016-05-21 16:05:09 UTC
++++ chrome/common/extensions/api/schemas.gypi
+@@ -177,7 +177,7 @@
+         ],
+       }, { # chromeos==0
+         'conditions': [
+-          ['OS=="linux" or OS=="win"', {
++          ['OS=="linux" or OS=="win" or os_bsd==1', {
+             'schema_files': [
+               '<@(input_ime_schema_file)',
+             ],
diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-chrome_common_extensions_command.cc
new file mode 100644
index 000000000000..17956682edd5
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_extensions_command.cc
@@ -0,0 +1,11 @@
+--- chrome/common/extensions/command.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/common/extensions/command.cc
+@@ -306,7 +306,7 @@ std::string Command::CommandPlatform() {
+   return values::kKeybindingPlatformMac;
+ #elif defined(OS_CHROMEOS)
+   return values::kKeybindingPlatformChromeOs;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   return values::kKeybindingPlatformLinux;
+ #else
+   return "";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
new file mode 100644
index 000000000000..cd10342818e0
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -0,0 +1,20 @@
+--- chrome/common/pref_names.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/common/pref_names.cc
+@@ -885,7 +885,7 @@ const char kForceYouTubeSafetyMode[] = "
+ // supervised users.
+ const char kRecordHistory[] = "settings.history_recorded";
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ // Linux specific preference on whether we should match the system theme.
+ const char kUsesSystemTheme[] = "extensions.theme.use_system";
+ #endif
+@@ -1348,7 +1348,7 @@ const char kDownloadDefaultDirectory[] =
+ // upgrade a unsafe location to a safe location.
+ const char kDownloadDirUpgraded[] = "download.directory_upgrade";
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ const char kOpenPdfDownloadInSystemReader[] =
+     "download.open_pdf_in_system_reader";
+ #endif
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
new file mode 100644
index 000000000000..4dc5837e22ec
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -0,0 +1,20 @@
+--- chrome/common/pref_names.h.orig	2016-05-25 15:00:58.000000000 -0400
++++ chrome/common/pref_names.h	2016-05-27 10:03:13.560677000 -0400
+@@ -307,7 +307,7 @@
+ extern const char kDeleteTimePeriod[];
+ extern const char kLastClearBrowsingDataTime[];
+ extern const char kClearBrowsingDataHistoryNoticeShownTimes[];
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+ extern const char kUsesSystemTheme[];
+ #endif
+ extern const char kCurrentThemePackFilename[];
+@@ -477,7 +477,7 @@
+ extern const char kDownloadDefaultDirectory[];
+ extern const char kDownloadExtensionsToOpen[];
+ extern const char kDownloadDirUpgraded[];
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
+ extern const char kOpenPdfDownloadInSystemReader[];
+ #endif
+ 
diff --git a/www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp b/www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp
new file mode 100644
index 000000000000..e583b2d9f885
--- /dev/null
+++ b/www/chromium/files/patch-chrome_common_variations_fieldtrial__testing__config.gyp
@@ -0,0 +1,11 @@
+--- chrome/common/variations/fieldtrial_testing_config.gyp.orig	2016-03-25 13:04:46 UTC
++++ chrome/common/variations/fieldtrial_testing_config.gyp
+@@ -19,7 +19,7 @@
+       'conditions': [
+         ['OS!="android"', {'sources/': [['exclude', '_android\\.json$']]}],
+         ['OS!="win"', {'sources/': [['exclude', '_win\\.json$']]}],
+-        ['OS!="linux" or chromeos==1', {'sources/': [['exclude', '_linux\\.json$']]}],
++        ['(OS!="linux" or chromeos==1) and os_bsd!=1', {'sources/': [['exclude', '_linux\\.json$']]}],
+         ['OS!="mac"', {'sources/': [['exclude', '_mac\\.json$']]}],
+         ['chromeos!=1', {'sources/': [['exclude', '_chromeos\\.json$']]}],
+         ['OS!="ios"', {'sources/': [['exclude', '_ios\\.json$']]}],
diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
new file mode 100644
index 000000000000..cb80bdab2845
--- /dev/null
+++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc
@@ -0,0 +1,38 @@
+--- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/renderer/pepper/pepper_flash_font_file_host.cc
+@@ -14,7 +14,7 @@
+ #include "ppapi/proxy/ppapi_messages.h"
+ #include "ppapi/proxy/serialized_structs.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "content/public/common/child_process_sandbox_support_linux.h"
+ #elif defined(OS_WIN)
+ #include "third_party/skia/include/ports/SkFontMgr.h"
+@@ -27,7 +27,7 @@ PepperFlashFontFileHost::PepperFlashFont
+     const ppapi::proxy::SerializedFontDescription& description,
+     PP_PrivateFontCharset charset)
+     : ResourceHost(host->GetPpapiHost(), instance, resource) {
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   fd_.reset(content::MatchFontWithFallback(
+       description.face,
+       description.weight >= PP_BROWSERFONT_TRUSTED_WEIGHT_BOLD,
+@@ -44,7 +44,7 @@ PepperFlashFontFileHost::PepperFlashFont
+   skia::RefPtr<SkFontMgr> font_mgr = skia::AdoptRef(SkFontMgr::RefDefault());
+   typeface_ = skia::AdoptRef(
+       font_mgr->matchFamilyStyle(description.face.c_str(), style));
+-#endif  // defined(OS_LINUX) || defined(OS_OPENBSD)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ PepperFlashFontFileHost::~PepperFlashFontFileHost() {}
+@@ -63,7 +63,7 @@ bool PepperFlashFontFileHost::GetFontDat
+                                           void* buffer,
+                                           size_t* length) {
+   bool result = false;
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   int fd = fd_.get();
+   if (fd != -1)
+     result = content::GetFontTable(fd, table, 0 /* offset */,
diff --git a/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
new file mode 100644
index 000000000000..cd7fcc19d2d5
--- /dev/null
+++ b/www/chromium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h
@@ -0,0 +1,20 @@
+--- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig	2016-05-11 19:02:17 UTC
++++ chrome/renderer/pepper/pepper_flash_font_file_host.h
+@@ -14,7 +14,7 @@
+ #include "ppapi/c/private/pp_private_font_charset.h"
+ #include "ppapi/host/resource_host.h"
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/files/scoped_file.h"
+ #elif defined(OS_WIN)
+ #include "skia/ext/refptr.h"
+@@ -50,7 +50,7 @@ class PepperFlashFontFileHost : public p
+                          uint32_t table);
+   bool GetFontData(uint32_t table, void* buffer, size_t* length);
+ 
+-#if defined(OS_LINUX) || defined(OS_OPENBSD)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::ScopedFD fd_;
+ #elif defined(OS_WIN)
+   skia::RefPtr<SkTypeface> typeface_;
diff --git a/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
new file mode 100644
index 000000000000..3d8c04857888
--- /dev/null
+++ b/www/chromium/files/patch-chrome_test_base_in__process__browser__test.cc
@@ -0,0 +1,13 @@
+--- chrome/test/base/in_process_browser_test.cc.orig	2016-05-11 19:02:17 UTC
++++ chrome/test/base/in_process_browser_test.cc
+@@ -90,6 +90,10 @@
+ 
+ namespace {
+ 
++#if defined(OS_FREEBSD)
++#include <signal.h>
++#endif
++
+ // Passed as value of kTestType.
+ const char kBrowserTestType[] = "browser";
+ 
diff --git a/www/chromium/files/patch-chrome_test_base_testing__browser__process.h b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
new file mode 100644
index 000000000000..f43e8ff98f11
--- /dev/null
+++ b/www/chromium/files/patch-chrome_test_base_testing__browser__process.h
@@ -0,0 +1,13 @@
+--- chrome/test/base/testing_browser_process.h.orig	2016-05-11 19:02:17 UTC
++++ chrome/test/base/testing_browser_process.h
+@@ -104,8 +104,8 @@ class TestingBrowserProcess : public Bro
+   DownloadStatusUpdater* download_status_updater() override;
+   DownloadRequestLimiter* download_request_limiter() override;
+ 
+-#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)
+-  void StartAutoupdateTimer() override {}
++#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS)
++  void StartAutoupdateTimer() /*override*/ {}
+ #endif
+ 
+   net_log::ChromeNetLog* net_log() override;
diff --git a/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
new file mode 100644
index 000000000000..8da10e9e5da4
--- /dev/null
+++ b/www/chromium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc
@@ -0,0 +1,20 @@
+--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig	2016-03-25 13:04:46 UTC
++++ chrome/test/chromedriver/chrome/chrome_finder.cc
+@@ -45,7 +45,7 @@ void GetApplicationDirs(std::vector<base
+         installation_locations[i].Append(L"Chromium\\Application"));
+   }
+ }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ void GetApplicationDirs(std::vector<base::FilePath>* locations) {
+   locations->push_back(base::FilePath("/opt/google/chrome"));
+   locations->push_back(base::FilePath("/usr/local/bin"));
+@@ -95,7 +95,7 @@ bool FindChrome(base::FilePath* browser_
+ #elif defined(OS_MACOSX)
+       base::FilePath("Google Chrome.app/Contents/MacOS/Google Chrome"),
+       base::FilePath("Chromium.app/Contents/MacOS/Chromium")
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+       base::FilePath("google-chrome"),
+       base::FilePath("chrome"),
+       base::FilePath("chromium"),
diff --git a/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc b/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc
deleted file mode 100644
index b408ab7ac814..000000000000
--- a/www/chromium/files/patch-components__autofill__content__renderer__password_form_conversion_utils.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2016-03-05 21:26:25.526530088 +0100
-+++ components/autofill/content/renderer/password_form_conversion_utils.cc	2016-03-05 21:26:38.502521878 +0100
-@@ -26,7 +26,11 @@
- #include "third_party/WebKit/public/web/WebFormControlElement.h"
- #include "third_party/WebKit/public/web/WebFrame.h"
- #include "third_party/WebKit/public/web/WebInputElement.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- using blink::WebDocument;
- using blink::WebFormControlElement;
diff --git a/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc b/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc
deleted file mode 100644
index 161054dfe752..000000000000
--- a/www/chromium/files/patch-components__autofill__core__browser__form_structure.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/autofill/core/browser/form_structure.cc.orig	2016-03-05 21:25:19.742524141 +0100
-+++ components/autofill/core/browser/form_structure.cc	2016-03-05 21:25:31.566523885 +0100
-@@ -35,7 +35,11 @@
- #include "components/rappor/rappor_service.h"
- #include "components/rappor/rappor_utils.h"
- #include "third_party/libxml/chromium/libxml_utils.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace autofill {
- namespace {
diff --git a/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc b/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc
deleted file mode 100644
index 17f11e83e423..000000000000
--- a/www/chromium/files/patch-components__cookie_config__cookie_store_util.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- ./components/cookie_config/cookie_store_util.cc.orig	2016-01-21 14:31:28.175486313 +0100
-+++ ./components/cookie_config/cookie_store_util.cc	2016-01-21 14:32:42.351481630 +0100
-@@ -10,7 +10,7 @@
- 
- namespace cookie_config {
- 
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- namespace {
- 
- // Use the operating system's mechanisms to encrypt cookies before writing
-@@ -62,10 +62,10 @@
- net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
-   return g_cookie_crypto_delegate.Pointer();
- }
--#else   // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#else   // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
-   return NULL;
- }
--#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
- 
- }  // namespace cookie_config
diff --git a/www/chromium/files/patch-components__dom_distiller__core__page_features.cc b/www/chromium/files/patch-components__dom_distiller__core__page_features.cc
deleted file mode 100644
index cf2e14cb98a5..000000000000
--- a/www/chromium/files/patch-components__dom_distiller__core__page_features.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/dom_distiller/core/page_features.cc.orig	2016-03-05 21:23:13.237533214 +0100
-+++ components/dom_distiller/core/page_features.cc	2016-03-05 21:23:28.813592348 +0100
-@@ -9,7 +9,11 @@
- #include <string>
- 
- #include "base/json/json_reader.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "url/gurl.h"
- 
- namespace dom_distiller {
diff --git a/www/chromium/files/patch-components__drive__drive_api_util.cc b/www/chromium/files/patch-components__drive__drive_api_util.cc
deleted file mode 100644
index afadcc947d23..000000000000
--- a/www/chromium/files/patch-components__drive__drive_api_util.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/drive/drive_api_util.cc.orig	2016-03-05 21:22:18.245536848 +0100
-+++ components/drive/drive_api_util.cc	2016-03-05 21:22:28.781536000 +0100
-@@ -22,7 +22,11 @@
- #include "google_apis/drive/drive_api_parser.h"
- #include "net/base/escape.h"
- #include "net/base/net_errors.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "url/gurl.h"
- 
- namespace drive {
diff --git a/www/chromium/files/patch-components__feedback__anonymizer_tool.cc b/www/chromium/files/patch-components__feedback__anonymizer_tool.cc
deleted file mode 100644
index d3a37cc74bf4..000000000000
--- a/www/chromium/files/patch-components__feedback__anonymizer_tool.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/feedback/anonymizer_tool.cc.orig	2016-03-05 21:12:40.810576880 +0100
-+++ components/feedback/anonymizer_tool.cc	2016-03-05 21:12:56.522575394 +0100
-@@ -9,7 +9,11 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "base/strings/stringprintf.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- using re2::RE2;
- 
diff --git a/www/chromium/files/patch-components__flags_ui__flags_state.cc b/www/chromium/files/patch-components__flags_ui__flags_state.cc
deleted file mode 100644
index abf8a9bb9b89..000000000000
--- a/www/chromium/files/patch-components__flags_ui__flags_state.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/flags_ui/flags_state.cc.orig	2016-03-04 21:01:15.539156962 +0100
-+++ components/flags_ui/flags_state.cc	2016-03-04 21:00:48.239033063 +0100
-@@ -450,7 +450,7 @@
-   return kOsWin;
- #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
-   return kOsCrOS;
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
-   return kOsLinux;
- #elif defined(OS_ANDROID)
-   return kOsAndroid;
diff --git a/www/chromium/files/patch-components__json_schema__json_schema_validator.cc b/www/chromium/files/patch-components__json_schema__json_schema_validator.cc
deleted file mode 100644
index 45f37a15e986..000000000000
--- a/www/chromium/files/patch-components__json_schema__json_schema_validator.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/json_schema/json_schema_validator.cc.orig	2016-03-05 17:55:58.871393896 +0100
-+++ components/json_schema/json_schema_validator.cc	2016-03-05 17:56:49.927387504 +0100
-@@ -20,7 +20,11 @@
- #include "base/strings/stringprintf.h"
- #include "base/values.h"
- #include "components/json_schema/json_schema_constants.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace schema = json_schema_constants;
- 
diff --git a/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc b/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc
deleted file mode 100644
index e3eaacc721d2..000000000000
--- a/www/chromium/files/patch-components__keyed_service__core__dependency_graph_unittest.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/keyed_service/core/dependency_graph_unittest.cc.orig	2016-03-05 21:17:52.372555224 +0100
-+++ components/keyed_service/core/dependency_graph_unittest.cc	2016-03-05 21:18:04.371555206 +0100
-@@ -9,7 +9,11 @@
- #include "components/keyed_service/core/dependency_graph.h"
- #include "components/keyed_service/core/dependency_node.h"
- #include "testing/gtest/include/gtest/gtest.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace {
- 
diff --git a/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc b/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
deleted file mode 100644
index 3ff02e625ae6..000000000000
--- a/www/chromium/files/patch-components__metrics__drive_metrics_provider_linux.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- components/metrics/drive_metrics_provider_linux.cc.orig	2015-10-14 16:34:04.903957000 +0200
-+++ components/metrics/drive_metrics_provider_linux.cc	2015-10-14 16:34:35.113096000 +0200
-@@ -4,7 +4,13 @@
- 
- #include "components/metrics/drive_metrics_provider.h"
- 
-+#if defined(OS_BSD)
-+#include <sys/types.h>
-+#define MAJOR(dev) major(dev)
-+#define MINOR(dev) minor(dev)
-+#else
- #include <linux/kdev_t.h>  // For MAJOR()/MINOR().
-+#endif
- #include <sys/stat.h>
- #include <string>
- 
diff --git a/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc b/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
deleted file mode 100644
index 5d96773c38a2..000000000000
--- a/www/chromium/files/patch-components__metrics__system_memory_stats_recorder_linux.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- components/metrics/system_memory_stats_recorder_linux.cc.orig	2015-09-03 20:30:21.188785000 -0400
-+++ components/metrics/system_memory_stats_recorder_linux.cc	2015-09-03 20:25:00.522580000 -0400
-@@ -29,6 +29,7 @@
-   UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
- 
- void RecordMemoryStats(RecordMemoryStatsType type) {
-+#if !defined(OS_FREEBSD)
-   base::SystemMemoryInfoKB memory;
-   if (!base::GetSystemMemoryInfo(&memory))
-     return;
-@@ -92,6 +93,7 @@
-       break;
-     }
-   }
-+#endif // !defined(OS_FREEBSD)
- }
- 
- }  // namespace memory
diff --git a/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc b/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc
deleted file mode 100644
index 80c7e7cd1d7a..000000000000
--- a/www/chromium/files/patch-components__password_manager__core__browser__import__csv_reader.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/password_manager/core/browser/import/csv_reader.cc.orig	2016-03-05 21:24:14.054528874 +0100
-+++ components/password_manager/core/browser/import/csv_reader.cc	2016-03-05 21:24:28.997912844 +0100
-@@ -9,7 +9,11 @@
- #include "base/logging.h"
- #include "base/macros.h"
- #include "base/strings/string_util.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace {
- 
diff --git a/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc b/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc
deleted file mode 100644
index 52976759d01b..000000000000
--- a/www/chromium/files/patch-components__plugins__renderer_plugin_placeholder.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/plugins/renderer/plugin_placeholder.cc.orig	2016-03-05 21:19:00.436550513 +0100
-+++ components/plugins/renderer/plugin_placeholder.cc	2016-03-05 21:20:14.436562091 +0100
-@@ -11,7 +11,11 @@
- #include "gin/object_template_builder.h"
- #include "third_party/WebKit/public/web/WebElement.h"
- #include "third_party/WebKit/public/web/WebPluginContainer.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace plugins {
- 
diff --git a/www/chromium/files/patch-components__policy__core__common__schema.cc b/www/chromium/files/patch-components__policy__core__common__schema.cc
deleted file mode 100644
index 47a3a54aba44..000000000000
--- a/www/chromium/files/patch-components__policy__core__common__schema.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/policy/core/common/schema.cc.orig	2016-03-05 19:30:39.179235992 +0100
-+++ components/policy/core/common/schema.cc	2016-03-05 19:31:28.596994984 +0100
-@@ -21,7 +21,11 @@
- #include "components/json_schema/json_schema_constants.h"
- #include "components/json_schema/json_schema_validator.h"
- #include "components/policy/core/common/schema_internal.h"
-+#if defined(OS_FREEBSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace schema = json_schema_constants;
- 
diff --git a/www/chromium/files/patch-components__policy__resources__policy_templates.json b/www/chromium/files/patch-components__policy__resources__policy_templates.json
deleted file mode 100644
index 20ea5c052ac0..000000000000
--- a/www/chromium/files/patch-components__policy__resources__policy_templates.json
+++ /dev/null
@@ -1,29 +0,0 @@
---- components/policy/resources/policy_templates.json.orig	2014-10-10 09:15:31 UTC
-+++ components/policy/resources/policy_templates.json
-@@ -1563,7 +1563,7 @@
-           'name': 'GSSAPILibraryName',
-           'type': 'string',
-           'schema': { 'type': 'string' },
--          'supported_on': ['chrome.linux:9-'],
-+          'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'],
-           'features': {
-             'dynamic_refresh': False,
-             'per_profile': False,
-@@ -3771,7 +3771,7 @@
-       'name': 'RequireOnlineRevocationChecksForLocalAnchors',
-       'type': 'main',
-       'schema': { 'type': 'boolean' },
--      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
-+      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
-       'features': {
-         'dynamic_refresh': True,
-         'per_profile': False,
-@@ -4450,7 +4450,7 @@
-       'name': 'BackgroundModeEnabled',
-       'type': 'main',
-       'schema': { 'type': 'boolean' },
--      'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
-+      'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'],
-       'features': {
-         'can_be_recommended': True,
-         'dynamic_refresh': True,
diff --git a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py b/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
deleted file mode 100644
index 6f46c29e8280..000000000000
--- a/www/chromium/files/patch-components__policy__tools__generate_policy_source.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/policy/tools/generate_policy_source.py.orig	2014-10-10 08:54:14 UTC
-+++ components/policy/tools/generate_policy_source.py
-@@ -73,7 +73,7 @@
-       if platform.startswith('chrome.'):
-         platform_sub = platform[7:]
-         if platform_sub == '*':
--          self.platforms.extend(['win', 'mac', 'linux'])
-+          self.platforms.extend(['win', 'mac', 'linux', 'freebsd'])
-         else:
-           self.platforms.append(platform_sub)
-       else:
diff --git a/www/chromium/files/patch-components__storage_monitor.gypi b/www/chromium/files/patch-components__storage_monitor.gypi
deleted file mode 100644
index b98c8a76086d..000000000000
--- a/www/chromium/files/patch-components__storage_monitor.gypi
+++ /dev/null
@@ -1,29 +0,0 @@
---- components/storage_monitor.gypi.orig	2014-10-10 08:54:14 UTC
-+++ components/storage_monitor.gypi
-@@ -50,6 +50,26 @@
-         'storage_monitor/volume_mount_watcher_win.h',
-       ],
-       'conditions': [
-+        ['os_bsd == 1', {
-+          'sources!': [
-+            'storage_monitor/media_transfer_protocol_device_observer_linux.cc',
-+            'storage_monitor/media_transfer_protocol_device_observer_linux.h',
-+            'storage_monitor/test_media_transfer_protocol_manager_linux.cc',
-+            'storage_monitor/test_media_transfer_protocol_manager_linux.h',
-+            'storage_monitor/mtab_watcher_linux.cc',
-+            'storage_monitor/mtab_watcher_linux.h',
-+            'storage_monitor/storage_monitor_linux.cc',
-+            'storage_monitor/storage_monitor_linux.h',
-+            'storage_monitor/udev_util_linux.cc',
-+            'storage_monitor/udev_util_linux.h',
-+          ],
-+        }],
-+        ['OS == "freebsd"', {
-+          'sources': [
-+            'storage_monitor/storage_monitor_freebsd.cc',
-+            'storage_monitor/storage_monitor_freebsd.h',
-+          ],
-+        }],
-         ['OS == "mac"', {
-           'link_settings': {
-             'libraries': [
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
deleted file mode 100644
index 514f70e416e3..000000000000
--- a/www/chromium/files/patch-components__storage_monitor__storage_monitor.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- components/storage_monitor/storage_monitor.cc.orig	2014-10-10 09:15:31 UTC
-+++ components/storage_monitor/storage_monitor.cc
-@@ -85,6 +85,7 @@
- 
- void StorageMonitor::EnsureInitialized(base::Closure callback) {
-   DCHECK(thread_checker_.CalledOnValidThread());
-+//#if !defined(OS_BSD) //XXX(rene) why disabled?
-   if (initialized_) {
-     if (!callback.is_null())
-       callback.Run();
-@@ -100,6 +101,7 @@
- 
-   initializing_ = true;
-   Init();
-+//#endif
- }
- 
- bool StorageMonitor::IsInitialized() const {
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
deleted file mode 100644
index 32c90c493504..000000000000
--- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.cc
+++ /dev/null
@@ -1,104 +0,0 @@
---- components/storage_monitor/storage_monitor_freebsd.cc.orig	1970-01-01 01:00:00.000000000 +0100
-+++ components/storage_monitor/storage_monitor_freebsd.cc	2015-04-19 19:38:05.000000000 +0200
-@@ -0,0 +1,101 @@
-+// 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.
-+
-+// StorageMonitorFreeBSD implementation.
-+
-+#include "components/storage_monitor/storage_monitor_freebsd.h"
-+
-+#include <stdio.h>
-+
-+#include <list>
-+
-+#include "base/bind.h"
-+#include "base/metrics/histogram.h"
-+#include "base/process/kill.h"
-+#include "base/process/launch.h"
-+#include "base/stl_util.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_util.h"
-+#include "base/strings/utf_string_conversions.h"
-+#include "components/storage_monitor/media_storage_util.h"
-+#include "components/storage_monitor/removable_device_constants.h"
-+#include "components/storage_monitor/storage_info.h"
-+
-+using content::BrowserThread;
-+
-+namespace storage_monitor {
-+
-+namespace {
-+
-+// udev device property constants.
-+const char kBlockSubsystemKey[] = "block";
-+const char kDiskDeviceTypeKey[] = "disk";
-+const char kFsUUID[] = "ID_FS_UUID";
-+const char kLabel[] = "ID_FS_LABEL";
-+const char kModel[] = "ID_MODEL";
-+const char kModelID[] = "ID_MODEL_ID";
-+const char kRemovableSysAttr[] = "removable";
-+const char kSerialShort[] = "ID_SERIAL_SHORT";
-+const char kSizeSysAttr[] = "size";
-+const char kVendor[] = "ID_VENDOR";
-+const char kVendorID[] = "ID_VENDOR_ID";
-+
-+StorageMonitor::EjectStatus EjectPathOnFileThread(
-+    const base::FilePath& path,
-+    const base::FilePath& device) {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-+
-+  static const char kUmountBinary[] = "/sbin/umount";
-+  std::vector<std::string> command;
-+  command.push_back(kUmountBinary);
-+  command.push_back(path.value());
-+
-+  base::LaunchOptions options;
-+  base::Process process = base::LaunchProcess(command, options);
-+  if (!process.IsValid())
-+    return StorageMonitor::EJECT_FAILURE;
-+
-+  int exit_code = -1;
-+  if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
-+                                      &exit_code)) {
-+    process.Terminate(-1, false);
-+    base::EnsureProcessTerminated(std::move(process));
-+    return StorageMonitor::EJECT_FAILURE;
-+  }
-+
-+  // TODO(gbillock): Make sure this is found in documentation
-+  // somewhere. Experimentally it seems to hold that exit code
-+  // 1 means device is in use.
-+  if (exit_code == 1)
-+    return StorageMonitor::EJECT_IN_USE;
-+  if (exit_code != 0)
-+    return StorageMonitor::EJECT_FAILURE;
-+
-+  return StorageMonitor::EJECT_OK;
-+}
-+
-+}  // namespace
-+
-+StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-+}
-+
-+StorageMonitorFreeBSD::~StorageMonitorFreeBSD() {
-+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-+}
-+
-+void StorageMonitorFreeBSD::Init() {
-+}
-+
-+bool StorageMonitorFreeBSD::GetStorageInfoForPath(
-+    const base::FilePath& path,
-+    StorageInfo* device_info) const {
-+  return false; // TODO
-+}
-+
-+StorageMonitor* StorageMonitor::CreateInternal() {
-+  return new StorageMonitorFreeBSD();
-+}
-+
-+} // namespace storage_monitor
diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
deleted file mode 100644
index 5fcba91ac4a0..000000000000
--- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h
+++ /dev/null
@@ -1,49 +0,0 @@
---- components/storage_monitor/storage_monitor_freebsd.h.orig	2015-01-24 17:14:44 UTC
-+++ components/storage_monitor/storage_monitor_freebsd.h
-@@ -0,0 +1,46 @@
-+// 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.
-+
-+// StorageMonitorFreeBSD processes mount point change events, notifies listeners
-+// about the addition and deletion of media devices, and answers queries about
-+// mounted devices.
-+// StorageMonitorFreeBSD lives on the UI thread, and uses ???
-+// the FILE thread to get mount point change events.
-+
-+#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
-+#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
-+
-+#include <map>
-+#include <string>
-+
-+#include "base/compiler_specific.h"
-+#include "base/files/file_path.h"
-+#include "base/files/file_path_watcher.h"
-+#include "base/memory/scoped_ptr.h"
-+#include "base/memory/weak_ptr.h"
-+#include "components/storage_monitor/storage_monitor.h"
-+#include "content/public/browser/browser_thread.h"
-+
-+namespace storage_monitor {
-+
-+class StorageMonitorFreeBSD : public StorageMonitor {
-+ public:
-+  // Should only be called by browser start up code.
-+  // Use StorageMonitor::GetInstance() instead.
-+  explicit StorageMonitorFreeBSD();
-+  virtual ~StorageMonitorFreeBSD();
-+
-+  // Must be called for StorageMonitorFreeBSD to work.
-+  virtual void Init() override;
-+ private:
-+  // StorageMonitor implementation.
-+  virtual bool GetStorageInfoForPath(const base::FilePath& path,
-+                                     StorageInfo* device_info) const override;
-+
-+  DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD);
-+};
-+
-+} // namespace storage_monitor
-+
-+#endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
diff --git a/www/chromium/files/patch-components__update_client__update_query_params.cc b/www/chromium/files/patch-components__update_client__update_query_params.cc
deleted file mode 100644
index 60c03304c562..000000000000
--- a/www/chromium/files/patch-components__update_client__update_query_params.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/update_client/update_query_params.cc.orig	2015-04-19 21:26:41.000000000 +0200
-+++ components/update_client/update_query_params.cc	2015-04-19 21:27:50.000000000 +0200
-@@ -31,6 +31,8 @@
-     "linux";
- #elif defined(OS_OPENBSD)
-     "openbsd";
-+#elif defined(OS_FREEBSD)
-+    "freebsd";
- #else
- #error "unknown os"
- #endif
diff --git a/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc b/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc
deleted file mode 100644
index a1951bfa921b..000000000000
--- a/www/chromium/files/patch-components__url_matcher__regex_set_matcher.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- components/url_matcher/regex_set_matcher.cc.orig	2016-03-05 21:14:47.451567783 +0100
-+++ components/url_matcher/regex_set_matcher.cc	2016-03-05 21:15:45.419563760 +0100
-@@ -10,8 +10,13 @@
- #include "base/stl_util.h"
- #include "base/strings/string_util.h"
- #include "components/url_matcher/substring_set_matcher.h"
-+#if defined(OS_BSD)
-+#include <re2/filtered_re2.h>
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/filtered_re2.h"
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace url_matcher {
- 
diff --git a/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc b/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc
deleted file mode 100644
index 7edc5b7de412..000000000000
--- a/www/chromium/files/patch-components__url_matcher__url_matcher_factory.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/url_matcher/url_matcher_factory.cc.orig	2016-03-05 21:16:31.699560757 +0100
-+++ components/url_matcher/url_matcher_factory.cc	2016-03-05 21:16:54.155559498 +0100
-@@ -15,7 +15,11 @@
- #include "base/values.h"
- #include "components/url_matcher/url_matcher_constants.h"
- #include "components/url_matcher/url_matcher_helpers.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace url_matcher {
- 
diff --git a/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc b/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc
deleted file mode 100644
index 45b8e8f03a9d..000000000000
--- a/www/chromium/files/patch-components__webcrypto__algorithms__test_helpers.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- components/webcrypto/algorithms/test_helpers.cc.orig	2016-03-05 21:20:58.677542744 +0100
-+++ components/webcrypto/algorithms/test_helpers.cc	2016-03-05 21:21:13.733542071 +0100
-@@ -26,7 +26,11 @@
- #include "components/webcrypto/status.h"
- #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
- #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace webcrypto {
- 
diff --git a/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
new file mode 100644
index 000000000000..2d95a693b397
--- /dev/null
+++ b/www/chromium/files/patch-components_autofill_content_renderer_password__form__conversion__utils.cc
@@ -0,0 +1,14 @@
+--- components/autofill/content/renderer/password_form_conversion_utils.cc.orig	2016-05-11 19:02:18 UTC
++++ components/autofill/content/renderer/password_form_conversion_utils.cc
+@@ -26,7 +26,11 @@
+ #include "third_party/WebKit/public/web/WebFormControlElement.h"
+ #include "third_party/WebKit/public/web/WebFrame.h"
+ #include "third_party/WebKit/public/web/WebInputElement.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ using blink::WebDocument;
+ using blink::WebFormControlElement;
diff --git a/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc b/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc
new file mode 100644
index 000000000000..8ed24fbfb737
--- /dev/null
+++ b/www/chromium/files/patch-components_autofill_core_browser_form__structure.cc
@@ -0,0 +1,15 @@
+--- components/autofill/core/browser/form_structure.cc.orig	2016-05-11 19:02:18 UTC
++++ components/autofill/core/browser/form_structure.cc
+@@ -34,7 +34,11 @@
+ #include "components/autofill/core/common/form_field_data_predictions.h"
+ #include "components/rappor/rappor_service.h"
+ #include "components/rappor/rappor_utils.h"
+-#include "third_party/re2/src/re2/re2.h"
++#if defined(OS_BSD)
++#  include <re2/re2.h>
++#else
++#  include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace autofill {
+ namespace {
diff --git a/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
new file mode 100644
index 000000000000..fd7f887e36f4
--- /dev/null
+++ b/www/chromium/files/patch-components_cookie__config_cookie__store__util.cc
@@ -0,0 +1,24 @@
+--- components/cookie_config/cookie_store_util.cc.orig	2016-03-25 13:04:47 UTC
++++ components/cookie_config/cookie_store_util.cc
+@@ -11,7 +11,7 @@
+ 
+ namespace cookie_config {
+ 
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ namespace {
+ 
+ // Use the operating system's mechanisms to encrypt cookies before writing
+@@ -63,10 +63,10 @@ base::LazyInstance<CookieOSCryptoDelegat
+ net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
+   return g_cookie_crypto_delegate.Pointer();
+ }
+-#else   // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#else   // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ net::CookieCryptoDelegate* GetCookieCryptoDelegate() {
+   return NULL;
+ }
+-#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#endif  // defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+ 
+ }  // namespace cookie_config
diff --git a/www/chromium/files/patch-components_dom__distiller_core_page__features.cc b/www/chromium/files/patch-components_dom__distiller_core_page__features.cc
new file mode 100644
index 000000000000..12de0adb0c26
--- /dev/null
+++ b/www/chromium/files/patch-components_dom__distiller_core_page__features.cc
@@ -0,0 +1,15 @@
+--- components/dom_distiller/core/page_features.cc.orig	2016-05-25 15:00:59.000000000 -0400
++++ components/dom_distiller/core/page_features.cc	2016-05-27 10:13:11.588307000 -0400
+@@ -10,7 +10,11 @@
+ 
+ #include "base/json/json_reader.h"
+ #include "base/memory/scoped_ptr.h"
+-#include "third_party/re2/src/re2/re2.h"
++#if defined(OS_BSD)
++#  include <re2/re2.h>
++#else
++#  include "third_party/re2/src/re2/re2.h"
++#endif // defined(OS_BSD)
+ #include "url/gurl.h"
+ 
+ namespace dom_distiller {
diff --git a/www/chromium/files/patch-components_drive_drive__api__util.cc b/www/chromium/files/patch-components_drive_drive__api__util.cc
new file mode 100644
index 000000000000..4193ff87362e
--- /dev/null
+++ b/www/chromium/files/patch-components_drive_drive__api__util.cc
@@ -0,0 +1,14 @@
+--- components/drive/drive_api_util.cc.orig	2016-05-11 19:02:18 UTC
++++ components/drive/drive_api_util.cc
+@@ -22,7 +22,11 @@
+ #include "google_apis/drive/drive_api_parser.h"
+ #include "net/base/escape.h"
+ #include "net/base/net_errors.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "url/gurl.h"
+ 
+ namespace drive {
diff --git a/www/chromium/files/patch-components_feedback_anonymizer__tool.cc b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc
new file mode 100644
index 000000000000..22d9349003ed
--- /dev/null
+++ b/www/chromium/files/patch-components_feedback_anonymizer__tool.cc
@@ -0,0 +1,14 @@
+--- components/feedback/anonymizer_tool.cc.orig	2016-05-11 19:02:18 UTC
++++ components/feedback/anonymizer_tool.cc
+@@ -9,7 +9,11 @@
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
+ #include "base/strings/stringprintf.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ using re2::RE2;
+ 
diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
new file mode 100644
index 000000000000..a13b0eded890
--- /dev/null
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -0,0 +1,11 @@
+--- components/flags_ui/flags_state.cc.orig	2016-03-25 13:04:47 UTC
++++ components/flags_ui/flags_state.cc
+@@ -450,7 +450,7 @@ int FlagsState::GetCurrentPlatform() {
+   return kOsWin;
+ #elif defined(OS_CHROMEOS)  // Needs to be before the OS_LINUX check.
+   return kOsCrOS;
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_LINUX) || defined(OS_OPENBSD) || defined(OS_FREEBSD)
+   return kOsLinux;
+ #elif defined(OS_ANDROID)
+   return kOsAndroid;
diff --git a/www/chromium/files/patch-components_json__schema_json__schema__validator.cc b/www/chromium/files/patch-components_json__schema_json__schema__validator.cc
new file mode 100644
index 000000000000..48209be953f7
--- /dev/null
+++ b/www/chromium/files/patch-components_json__schema_json__schema__validator.cc
@@ -0,0 +1,14 @@
+--- components/json_schema/json_schema_validator.cc.orig	2016-05-11 19:02:18 UTC
++++ components/json_schema/json_schema_validator.cc
+@@ -20,7 +20,11 @@
+ #include "base/strings/stringprintf.h"
+ #include "base/values.h"
+ #include "components/json_schema/json_schema_constants.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace schema = json_schema_constants;
+ 
diff --git a/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
new file mode 100644
index 000000000000..997d5d4608ba
--- /dev/null
+++ b/www/chromium/files/patch-components_keyed__service_core_dependency__graph__unittest.cc
@@ -0,0 +1,14 @@
+--- components/keyed_service/core/dependency_graph_unittest.cc.orig	2016-03-25 13:04:47 UTC
++++ components/keyed_service/core/dependency_graph_unittest.cc
+@@ -9,7 +9,11 @@
+ #include "components/keyed_service/core/dependency_graph.h"
+ #include "components/keyed_service/core/dependency_node.h"
+ #include "testing/gtest/include/gtest/gtest.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace {
+ 
diff --git a/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
new file mode 100644
index 000000000000..e373e37dd590
--- /dev/null
+++ b/www/chromium/files/patch-components_metrics_drive__metrics__provider__linux.cc
@@ -0,0 +1,16 @@
+--- components/metrics/drive_metrics_provider_linux.cc.orig	2016-03-25 13:04:47 UTC
++++ components/metrics/drive_metrics_provider_linux.cc
+@@ -4,7 +4,13 @@
+ 
+ #include "components/metrics/drive_metrics_provider.h"
+ 
++#if defined(OS_BSD)
++#include <sys/types.h>
++#define MAJOR(dev) major(dev)
++#define MINOR(dev) minor(dev)
++#else
+ #include <linux/kdev_t.h>  // For MAJOR()/MINOR().
++#endif
+ #include <sys/stat.h>
+ #include <string>
+ 
diff --git a/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
new file mode 100644
index 000000000000..f20e81298569
--- /dev/null
+++ b/www/chromium/files/patch-components_metrics_system__memory__stats__recorder__linux.cc
@@ -0,0 +1,18 @@
+--- components/metrics/system_memory_stats_recorder_linux.cc.orig	2016-03-25 13:04:47 UTC
++++ components/metrics/system_memory_stats_recorder_linux.cc
+@@ -30,6 +30,7 @@ namespace metrics {
+   UMA_HISTOGRAM_LINEAR(name, sample, 2500, 50)
+ 
+ void RecordMemoryStats(RecordMemoryStatsType type) {
++#if !defined(OS_FREEBSD)
+   base::SystemMemoryInfoKB memory;
+   if (!base::GetSystemMemoryInfo(&memory))
+     return;
+@@ -93,6 +94,7 @@ void RecordMemoryStats(RecordMemoryStats
+       break;
+     }
+   }
++#endif // !defined(OS_FREEBSD)
+ }
+ 
+ }  // namespace metrics
diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js
new file mode 100644
index 000000000000..e4883026ab7e
--- /dev/null
+++ b/www/chromium/files/patch-components_neterror_resources_neterror.js
@@ -0,0 +1,11 @@
+--- components/neterror/resources/neterror.js.orig	2016-05-11 19:02:18 UTC
++++ components/neterror/resources/neterror.js
+@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings
+ }
+ 
+ var primaryControlOnLeft = true;
+-<if expr="is_macosx or is_ios or is_linux or is_android">
++<if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
+ primaryControlOnLeft = false;
+ </if>
+ 
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc
new file mode 100644
index 000000000000..7398305b47d8
--- /dev/null
+++ b/www/chromium/files/patch-components_password__manager_core_browser_import_csv__reader.cc
@@ -0,0 +1,14 @@
+--- components/password_manager/core/browser/import/csv_reader.cc.orig	2016-03-25 13:04:48 UTC
++++ components/password_manager/core/browser/import/csv_reader.cc
+@@ -9,7 +9,11 @@
+ #include "base/logging.h"
+ #include "base/macros.h"
+ #include "base/strings/string_util.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace {
+ 
diff --git a/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
new file mode 100644
index 000000000000..aaeffeb94cc7
--- /dev/null
+++ b/www/chromium/files/patch-components_plugins_renderer_plugin__placeholder.cc
@@ -0,0 +1,14 @@
+--- components/plugins/renderer/plugin_placeholder.cc.orig	2016-03-25 13:04:48 UTC
++++ components/plugins/renderer/plugin_placeholder.cc
+@@ -11,7 +11,11 @@
+ #include "gin/object_template_builder.h"
+ #include "third_party/WebKit/public/web/WebElement.h"
+ #include "third_party/WebKit/public/web/WebPluginContainer.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace plugins {
+ 
diff --git a/www/chromium/files/patch-components_policy_core_common_schema.cc b/www/chromium/files/patch-components_policy_core_common_schema.cc
new file mode 100644
index 000000000000..4b47fa3d917e
--- /dev/null
+++ b/www/chromium/files/patch-components_policy_core_common_schema.cc
@@ -0,0 +1,14 @@
+--- components/policy/core/common/schema.cc.orig	2016-05-11 19:02:18 UTC
++++ components/policy/core/common/schema.cc
+@@ -21,7 +21,11 @@
+ #include "components/json_schema/json_schema_constants.h"
+ #include "components/json_schema/json_schema_validator.h"
+ #include "components/policy/core/common/schema_internal.h"
++#if defined(OS_FREEBSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace schema = json_schema_constants;
+ 
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
new file mode 100644
index 000000000000..9858b0a185d8
--- /dev/null
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -0,0 +1,29 @@
+--- components/policy/resources/policy_templates.json.orig	2016-05-11 19:02:18 UTC
++++ components/policy/resources/policy_templates.json
+@@ -1918,7 +1918,7 @@
+           'name': 'GSSAPILibraryName',
+           'type': 'string',
+           'schema': { 'type': 'string' },
+-          'supported_on': ['chrome.linux:9-'],
++          'supported_on': ['chrome.linux:9-', 'chrome.freebsd:9-'],
+           'features': {
+             'dynamic_refresh': False,
+             'per_profile': False,
+@@ -4581,7 +4581,7 @@
+       'name': 'RequireOnlineRevocationChecksForLocalAnchors',
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+-      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'],
++      'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.freebsd:30-', 'chrome.win:30-'],
+       'features': {
+         'dynamic_refresh': True,
+         'per_profile': False,
+@@ -5410,7 +5410,7 @@
+       'name': 'BackgroundModeEnabled',
+       'type': 'main',
+       'schema': { 'type': 'boolean' },
+-      'supported_on': ['chrome.win:19-', 'chrome.linux:19-'],
++      'supported_on': ['chrome.win:19-', 'chrome.linux:19-', 'chrome.freebsd:19-'],
+       'features': {
+         'can_be_recommended': True,
+         'dynamic_refresh': True,
diff --git a/www/chromium/files/patch-components_policy_tools_generate__policy__source.py b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
new file mode 100644
index 000000000000..5d14b41d7285
--- /dev/null
+++ b/www/chromium/files/patch-components_policy_tools_generate__policy__source.py
@@ -0,0 +1,11 @@
+--- components/policy/tools/generate_policy_source.py.orig	2016-05-11 19:02:19 UTC
++++ components/policy/tools/generate_policy_source.py
+@@ -98,7 +98,7 @@ class PolicyDetails:
+       if platform.startswith('chrome.'):
+         platform_sub = platform[7:]
+         if platform_sub == '*':
+-          self.platforms.extend(['win', 'mac', 'linux'])
++          self.platforms.extend(['win', 'mac', 'linux', 'freebsd'])
+         else:
+           self.platforms.append(platform_sub)
+       else:
diff --git a/www/chromium/files/patch-components_storage__monitor.gypi b/www/chromium/files/patch-components_storage__monitor.gypi
new file mode 100644
index 000000000000..dc16dc406642
--- /dev/null
+++ b/www/chromium/files/patch-components_storage__monitor.gypi
@@ -0,0 +1,29 @@
+--- components/storage_monitor.gypi.orig	2016-03-25 13:04:48 UTC
++++ components/storage_monitor.gypi
+@@ -50,6 +50,26 @@
+         'storage_monitor/volume_mount_watcher_win.h',
+       ],
+       'conditions': [
++        ['os_bsd == 1', {
++          'sources!': [
++            'storage_monitor/media_transfer_protocol_device_observer_linux.cc',
++            'storage_monitor/media_transfer_protocol_device_observer_linux.h',
++            'storage_monitor/test_media_transfer_protocol_manager_linux.cc',
++            'storage_monitor/test_media_transfer_protocol_manager_linux.h',
++            'storage_monitor/mtab_watcher_linux.cc',
++            'storage_monitor/mtab_watcher_linux.h',
++            'storage_monitor/storage_monitor_linux.cc',
++            'storage_monitor/storage_monitor_linux.h',
++            'storage_monitor/udev_util_linux.cc',
++            'storage_monitor/udev_util_linux.h',
++          ],
++        }],
++        ['OS == "freebsd"', {
++          'sources': [
++            'storage_monitor/storage_monitor_freebsd.cc',
++            'storage_monitor/storage_monitor_freebsd.h',
++          ],
++        }],
+         ['OS == "mac"', {
+           'link_settings': {
+             'libraries': [
diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
new file mode 100644
index 000000000000..ebf18f6198ea
--- /dev/null
+++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor.cc
@@ -0,0 +1,18 @@
+--- components/storage_monitor/storage_monitor.cc.orig	2016-05-11 19:02:19 UTC
++++ components/storage_monitor/storage_monitor.cc
+@@ -85,6 +85,7 @@ std::vector<StorageInfo> StorageMonitor:
+ 
+ void StorageMonitor::EnsureInitialized(base::Closure callback) {
+   DCHECK(thread_checker_.CalledOnValidThread());
++//#if !defined(OS_BSD) //XXX(rene) why disabled?
+   if (initialized_) {
+     if (!callback.is_null())
+       callback.Run();
+@@ -100,6 +101,7 @@ void StorageMonitor::EnsureInitialized(b
+ 
+   initializing_ = true;
+   Init();
++//#endif
+ }
+ 
+ bool StorageMonitor::IsInitialized() const {
diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
new file mode 100644
index 000000000000..c329b4f9f87d
--- /dev/null
+++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.cc
@@ -0,0 +1,104 @@
+--- components/storage_monitor/storage_monitor_freebsd.cc.orig	2016-05-20 17:18:26 UTC
++++ components/storage_monitor/storage_monitor_freebsd.cc
+@@ -0,0 +1,101 @@
++// 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.
++
++// StorageMonitorFreeBSD implementation.
++
++#include "components/storage_monitor/storage_monitor_freebsd.h"
++
++#include <stdio.h>
++
++#include <list>
++
++#include "base/bind.h"
++#include "base/metrics/histogram.h"
++#include "base/process/kill.h"
++#include "base/process/launch.h"
++#include "base/stl_util.h"
++#include "base/strings/string_number_conversions.h"
++#include "base/strings/string_util.h"
++#include "base/strings/utf_string_conversions.h"
++#include "components/storage_monitor/media_storage_util.h"
++#include "components/storage_monitor/removable_device_constants.h"
++#include "components/storage_monitor/storage_info.h"
++
++using content::BrowserThread;
++
++namespace storage_monitor {
++
++namespace {
++
++// udev device property constants.
++const char kBlockSubsystemKey[] = "block";
++const char kDiskDeviceTypeKey[] = "disk";
++const char kFsUUID[] = "ID_FS_UUID";
++const char kLabel[] = "ID_FS_LABEL";
++const char kModel[] = "ID_MODEL";
++const char kModelID[] = "ID_MODEL_ID";
++const char kRemovableSysAttr[] = "removable";
++const char kSerialShort[] = "ID_SERIAL_SHORT";
++const char kSizeSysAttr[] = "size";
++const char kVendor[] = "ID_VENDOR";
++const char kVendorID[] = "ID_VENDOR_ID";
++
++StorageMonitor::EjectStatus EjectPathOnFileThread(
++    const base::FilePath& path,
++    const base::FilePath& device) {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
++
++  static const char kUmountBinary[] = "/sbin/umount";
++  std::vector<std::string> command;
++  command.push_back(kUmountBinary);
++  command.push_back(path.value());
++
++  base::LaunchOptions options;
++  base::Process process = base::LaunchProcess(command, options);
++  if (!process.IsValid())
++    return StorageMonitor::EJECT_FAILURE;
++
++  int exit_code = -1;
++  if (!process.WaitForExitWithTimeout(base::TimeDelta::FromMilliseconds(3000),
++                                      &exit_code)) {
++    process.Terminate(-1, false);
++    base::EnsureProcessTerminated(std::move(process));
++    return StorageMonitor::EJECT_FAILURE;
++  }
++
++  // TODO(gbillock): Make sure this is found in documentation
++  // somewhere. Experimentally it seems to hold that exit code
++  // 1 means device is in use.
++  if (exit_code == 1)
++    return StorageMonitor::EJECT_IN_USE;
++  if (exit_code != 0)
++    return StorageMonitor::EJECT_FAILURE;
++
++  return StorageMonitor::EJECT_OK;
++}
++
++}  // namespace
++
++StorageMonitorFreeBSD::StorageMonitorFreeBSD() {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++StorageMonitorFreeBSD::~StorageMonitorFreeBSD() {
++  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
++}
++
++void StorageMonitorFreeBSD::Init() {
++}
++
++bool StorageMonitorFreeBSD::GetStorageInfoForPath(
++    const base::FilePath& path,
++    StorageInfo* device_info) const {
++  return false; // TODO
++}
++
++StorageMonitor* StorageMonitor::CreateInternal() {
++  return new StorageMonitorFreeBSD();
++}
++
++} // namespace storage_monitor
diff --git a/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
new file mode 100644
index 000000000000..d61d3b9d15c6
--- /dev/null
+++ b/www/chromium/files/patch-components_storage__monitor_storage__monitor__freebsd.h
@@ -0,0 +1,49 @@
+--- components/storage_monitor/storage_monitor_freebsd.h.orig	2016-05-20 17:18:26 UTC
++++ components/storage_monitor/storage_monitor_freebsd.h
+@@ -0,0 +1,46 @@
++// 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.
++
++// StorageMonitorFreeBSD processes mount point change events, notifies listeners
++// about the addition and deletion of media devices, and answers queries about
++// mounted devices.
++// StorageMonitorFreeBSD lives on the UI thread, and uses ???
++// the FILE thread to get mount point change events.
++
++#ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
++#define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
++
++#include <map>
++#include <string>
++
++#include "base/compiler_specific.h"
++#include "base/files/file_path.h"
++#include "base/files/file_path_watcher.h"
++#include "base/memory/scoped_ptr.h"
++#include "base/memory/weak_ptr.h"
++#include "components/storage_monitor/storage_monitor.h"
++#include "content/public/browser/browser_thread.h"
++
++namespace storage_monitor {
++
++class StorageMonitorFreeBSD : public StorageMonitor {
++ public:
++  // Should only be called by browser start up code.
++  // Use StorageMonitor::GetInstance() instead.
++  explicit StorageMonitorFreeBSD();
++  virtual ~StorageMonitorFreeBSD();
++
++  // Must be called for StorageMonitorFreeBSD to work.
++  virtual void Init() override;
++ private:
++  // StorageMonitor implementation.
++  virtual bool GetStorageInfoForPath(const base::FilePath& path,
++                                     StorageInfo* device_info) const override;
++
++  DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD);
++};
++
++} // namespace storage_monitor
++
++#endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_FREEBSD_H_
diff --git a/www/chromium/files/patch-components_update__client_update__query__params.cc b/www/chromium/files/patch-components_update__client_update__query__params.cc
new file mode 100644
index 000000000000..6f242082134f
--- /dev/null
+++ b/www/chromium/files/patch-components_update__client_update__query__params.cc
@@ -0,0 +1,11 @@
+--- components/update_client/update_query_params.cc.orig	2016-05-11 19:02:20 UTC
++++ components/update_client/update_query_params.cc
+@@ -31,6 +31,8 @@ const char kOs[] =
+     "linux";
+ #elif defined(OS_OPENBSD)
+     "openbsd";
++#elif defined(OS_FREEBSD)
++    "freebsd";
+ #else
+ #error "unknown os"
+ #endif
diff --git a/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
new file mode 100644
index 000000000000..31765a2908be
--- /dev/null
+++ b/www/chromium/files/patch-components_url__matcher_regex__set__matcher.cc
@@ -0,0 +1,16 @@
+--- components/url_matcher/regex_set_matcher.cc.orig	2016-03-25 13:04:48 UTC
++++ components/url_matcher/regex_set_matcher.cc
+@@ -10,8 +10,13 @@
+ #include "base/stl_util.h"
+ #include "base/strings/string_util.h"
+ #include "components/url_matcher/substring_set_matcher.h"
++#if defined(OS_BSD)
++#include <re2/filtered_re2.h>
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/filtered_re2.h"
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace url_matcher {
+ 
diff --git a/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
new file mode 100644
index 000000000000..9ec695e2875c
--- /dev/null
+++ b/www/chromium/files/patch-components_url__matcher_url__matcher__factory.cc
@@ -0,0 +1,14 @@
+--- components/url_matcher/url_matcher_factory.cc.orig	2016-05-11 19:02:20 UTC
++++ components/url_matcher/url_matcher_factory.cc
+@@ -15,7 +15,11 @@
+ #include "base/values.h"
+ #include "components/url_matcher/url_matcher_constants.h"
+ #include "components/url_matcher/url_matcher_helpers.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace url_matcher {
+ 
diff --git a/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
new file mode 100644
index 000000000000..7d3e7366f66d
--- /dev/null
+++ b/www/chromium/files/patch-components_webcrypto_algorithms_test__helpers.cc
@@ -0,0 +1,14 @@
+--- components/webcrypto/algorithms/test_helpers.cc.orig	2016-05-11 19:02:20 UTC
++++ components/webcrypto/algorithms/test_helpers.cc
+@@ -26,7 +26,11 @@
+ #include "components/webcrypto/status.h"
+ #include "third_party/WebKit/public/platform/WebCryptoAlgorithmParams.h"
+ #include "third_party/WebKit/public/platform/WebCryptoKeyAlgorithm.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace webcrypto {
+ 
diff --git a/www/chromium/files/patch-content__app__content_main_runner.cc b/www/chromium/files/patch-content__app__content_main_runner.cc
deleted file mode 100644
index ee64a322905e..000000000000
--- a/www/chromium/files/patch-content__app__content_main_runner.cc
+++ /dev/null
@@ -1,42 +0,0 @@
---- content/app/content_main_runner.cc.orig	2016-01-21 16:00:09.209120298 +0100
-+++ content/app/content_main_runner.cc	2016-01-21 16:02:40.649109123 +0100
-@@ -98,10 +98,10 @@
- #include "base/posix/global_descriptors.h"
- #include "content/public/common/content_descriptors.h"
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- #include "content/public/common/zygote_fork_delegate_linux.h"
- #endif
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- #include "content/zygote/zygote_main.h"
- #endif
- 
-@@ -259,7 +259,7 @@
-   int (*function)(const MainFunctionParams&);
- };
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- // On platforms that use the zygote, we have a special subset of
- // subprocesses that are launched via the zygote.  This function
- // fills in some process-launching bits around ZygoteMain().
-@@ -308,7 +308,7 @@
-   NOTREACHED() << "Unknown zygote process type: " << process_type;
-   return 1;
- }
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- 
- #if !defined(OS_IOS)
- static void RegisterMainThreadFactories() {
-@@ -379,7 +379,7 @@
-     }
-   }
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   // Zygote startup is special -- see RunZygote comments above
-   // for why we don't use ZygoteMain directly.
-   if (process_type == switches::kZygoteProcess)
diff --git a/www/chromium/files/patch-content__browser__browser_main_loop.cc b/www/chromium/files/patch-content__browser__browser_main_loop.cc
deleted file mode 100644
index ddfed74235fb..000000000000
--- a/www/chromium/files/patch-content__browser__browser_main_loop.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/browser_main_loop.cc.orig	2014-10-10 09:15:31 UTC
-+++ content/browser/browser_main_loop.cc
-@@ -135,7 +135,7 @@
- namespace content {
- namespace {
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- void SetupSandbox(const base::CommandLine& parsed_command_line) {
-   TRACE_EVENT0("startup", "SetupSandbox");
-   base::FilePath sandbox_binary;
-@@ -377,7 +377,7 @@
- void BrowserMainLoop::EarlyInitialization() {
-   TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   // No thread should be created before this call, as SetupSandbox()
-   // will end-up using fork().
-   SetupSandbox(parsed_command_line_);
diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc
deleted file mode 100644
index 34082ad1524a..000000000000
--- a/www/chromium/files/patch-content__browser__child_process_launcher.cc
+++ /dev/null
@@ -1,109 +0,0 @@
---- content/browser/child_process_launcher.cc.orig	2016-03-04 22:27:56.807672733 +0100
-+++ content/browser/child_process_launcher.cc	2016-03-04 22:34:35.624645928 +0100
-@@ -116,7 +116,11 @@
-   base::EnvironmentMap env = delegate->GetEnvironment();
-   base::ScopedFD ipcfd = delegate->TakeIpcFd();
- #elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#if !defined(OS_BSD)
-   bool use_zygote = delegate->ShouldUseZygote();
-+#else
-+  bool use_zygote = false;
-+#endif
-   base::EnvironmentMap env = delegate->GetEnvironment();
-   base::ScopedFD ipcfd = delegate->TakeIpcFd();
- #endif
-@@ -145,7 +149,7 @@
- #endif
- #endif
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
-   std::map<int, base::MemoryMappedFile::Region> regions;
-   GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess(
-       *cmd_line, child_process_id, files_to_register.get()
-@@ -178,7 +182,7 @@
-     }
-   }
- #endif  // defined(V8_USE_EXTERNAL_STARTUP_DATA)
--#endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
-+#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- 
- #if defined(OS_ANDROID)
-   files_to_register->Share(
-@@ -198,21 +202,21 @@
-   // We need to close the client end of the IPC channel to reliably detect
-   // child termination.
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   if (use_zygote) {
-     base::ProcessHandle handle = ZygoteHostImpl::GetInstance()->ForkRequest(
-         cmd_line->argv(), std::move(files_to_register), process_type);
-     process = base::Process(handle);
-   } else
-   // Fall through to the normal posix case below when we're not zygoting.
--#endif  // !defined(OS_MACOSX)
-+#endif  // !defined(OS_MACOSX) && !defined(OS_BSD)
-   {
-     // Convert FD mapping to FileHandleMappingVector
-     base::FileHandleMappingVector fds_to_map =
-         files_to_register->GetMappingWithIDAdjustment(
-             base::GlobalDescriptors::kBaseDescriptor);
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-     if (process_type == switches::kRendererProcess) {
-       const int sandbox_fd =
-           RenderSandboxHostLinux::GetInstance()->GetRendererSocket();
-@@ -220,7 +224,7 @@
-           sandbox_fd,
-           GetSandboxFD()));
-     }
--#endif  // defined(OS_MACOSX)
-+#endif  // defined(OS_MACOSX) && !defined(OS_BSD)
- 
-     // Actually launch the app.
-     base::LaunchOptions options;
-@@ -296,13 +300,13 @@
-   process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
-   // On POSIX, we must additionally reap the child.
- #if defined(OS_POSIX)
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-   if (zygote) {
-     // If the renderer was created via a zygote, we have to proxy the reaping
-     // through the zygote process.
-     ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle());
-   } else
--#endif  // !OS_MACOSX
-+#endif  // !OS_MACOSX && !defined(OS_BSD)
-     base::EnsureProcessTerminated(std::move(process));
- #endif  // OS_POSIX
- #endif  // defined(OS_ANDROID)
-@@ -398,7 +402,7 @@
- 
- void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
-   DCHECK(CalledOnValidThread());
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   if (zygote_) {
-     termination_status_ = ZygoteHostImpl::GetInstance()->
-         GetTerminationStatus(process_.Handle(), known_dead, &exit_code_);
-@@ -406,7 +410,7 @@
-     termination_status_ =
-         base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
-   } else {
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
-   if (known_dead) {
-     termination_status_ =
-         base::GetKnownDeadTerminationStatus(process_.Handle(), &exit_code_);
-@@ -469,7 +473,7 @@
-   starting_ = false;
-   process_ = std::move(process);
- 
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
-   zygote_ = zygote;
- #endif
-   if (process_.IsValid()) {
diff --git a/www/chromium/files/patch-content__browser__download__base_file.cc b/www/chromium/files/patch-content__browser__download__base_file.cc
deleted file mode 100644
index f2453fd16fde..000000000000
--- a/www/chromium/files/patch-content__browser__download__base_file.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- content/browser/download/base_file.cc.orig	2014-10-10 08:54:14 UTC
-+++ content/browser/download/base_file.cc
-@@ -208,7 +208,8 @@
- }
- 
- // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
--#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
-+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && \
-+    !defined(OS_BSD)
- DownloadInterruptReason BaseFile::AnnotateWithSourceInformation() {
-   return DOWNLOAD_INTERRUPT_REASON_NONE;
- }
diff --git a/www/chromium/files/patch-content__browser__download__base_file_linux.cc b/www/chromium/files/patch-content__browser__download__base_file_linux.cc
deleted file mode 100644
index 7d420406c713..000000000000
--- a/www/chromium/files/patch-content__browser__download__base_file_linux.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- content/browser/download/base_file_linux.cc.orig	2014-10-10 08:54:14 UTC
-+++ content/browser/download/base_file_linux.cc
-@@ -13,7 +13,9 @@
-   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-   DCHECK(!detached_);
- 
-+#if !defined(OS_BSD)
-   AddOriginMetadataToFile(full_path_, source_url_, referrer_url_);
-+#endif
-   return DOWNLOAD_INTERRUPT_REASON_NONE;
- }
- 
diff --git a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc b/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
deleted file mode 100644
index 523040433216..000000000000
--- a/www/chromium/files/patch-content__browser__geolocation__location_arbitrator_impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/geolocation/location_arbitrator_impl.cc.orig	2014-10-10 08:54:14 UTC
-+++ content/browser/geolocation/location_arbitrator_impl.cc
-@@ -159,7 +159,7 @@
- }
- 
- LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
-   return NULL;
- #else
-   return content::NewSystemLocationProvider();
diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
deleted file mode 100644
index 6af3455d0b58..000000000000
--- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.cc
+++ /dev/null
@@ -1,204 +0,0 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2014-10-13 17:11:09 UTC
-+++ content/browser/geolocation/wifi_data_provider_freebsd.cc
-@@ -0,0 +1,201 @@
-+// Copyright (c) 2010 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.
-+
-+// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
-+// and then check for those with an 802.11 media type and able to return
-+// a list of stations.  This is similar to ifconfig(8).
-+
-+#include "content/browser/geolocation/wifi_data_provider_freebsd.h"
-+
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/sockio.h>
-+#include <net/if.h>
-+#include <net/if_media.h>
-+#include <ifaddrs.h>
-+#include <net80211/ieee80211_ioctl.h>
-+#include <net/ethernet.h>
-+
-+#include "base/strings/utf_string_conversions.h"
-+#include "content/browser/geolocation/wifi_data_provider_common.h"
-+#include "content/browser/geolocation/wifi_data_provider_manager.h"
-+
-+namespace content {
-+namespace {
-+// The time periods, in milliseconds, between successive polls of the wifi data.
-+const int kDefaultPollingInterval = 10000;  // 10s
-+const int kNoChangePollingInterval = 120000;  // 2 mins
-+const int kTwoNoChangePollingInterval = 600000;  // 10 mins
-+const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
-+
-+// Convert a wifi frequency to the corresponding channel.
-+// Taken from wifi_data_provider_linux.cc where it says this was
-+// adapted from geolocaiton/wifilib.cc in googleclient (internal to google).
-+int frquency_to_channel(int frequency_Mhz) {
-+	if (frequency_Mhz >= 2412 && frequency_Mhz <= 2472)  // Channels 1-13.
-+		return (frequency_Mhz - 2407) / 5;
-+	if (frequency_Mhz == 2484)
-+		return 14;
-+	if (frequency_Mhz > 5000 && frequency_Mhz < 6000)  // .11a bands.
-+		return (frequency_Mhz - 5000) / 5;
-+	// Ignore everything else.
-+	return AccessPointData().channel;  // invalid channel
-+}
-+
-+// Provides the wifi API binding for FreeBSD.
-+class AccessPointDataFreeBSD : public WifiDataProviderCommon::WlanApiInterface {
-+public:
-+	AccessPointDataFreeBSD();
-+	~AccessPointDataFreeBSD();
-+
-+	// this does nothing
-+	bool Init();
-+
-+	// get the AP data
-+	virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data);
-+
-+private:
-+	DISALLOW_COPY_AND_ASSIGN(AccessPointDataFreeBSD);
-+};
-+
-+AccessPointDataFreeBSD::AccessPointDataFreeBSD() {
-+}
-+
-+AccessPointDataFreeBSD::~AccessPointDataFreeBSD() {
-+}
-+
-+bool AccessPointDataFreeBSD::Init() {
-+	return true;
-+}
-+
-+bool AccessPointDataFreeBSD::GetAccessPointData(WifiData::AccessPointDataSet* data) {
-+	bool			res;
-+	char			*dupn;
-+	struct ifaddrs		*ifal, *ifa;
-+	struct ifreq		ifr;
-+	struct ifmediareq	ifmr;
-+	struct ieee80211req 	i802r;
-+	int			s;
-+	char			iscanbuf[32*1024], *vsr;
-+	unsigned		len;
-+	AccessPointData		apd;
-+
-+	res = false;
-+	if (getifaddrs(&ifal) < 0)
-+		return res;
-+
-+	dupn = NULL;
-+	for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
-+		memset(&ifr, 0, sizeof(ifr));
-+
-+		if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
-+			continue;
-+		dupn = ifa->ifa_name;
-+
-+		strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
-+		ifr.ifr_addr.sa_family = AF_LOCAL;
-+
-+		if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
-+			continue;
-+
-+		(void) memset(&ifmr, 0, sizeof(ifmr));
-+		(void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
-+
-+		if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
-+			close(s);
-+			continue;
-+		}
-+		if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
-+			close(s);
-+			continue;
-+		}
-+
-+		(void) memset(&i802r, 0, sizeof(i802r));
-+		(void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
-+		i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
-+		i802r.i_data = iscanbuf;
-+		i802r.i_len = sizeof(iscanbuf);
-+		if (ioctl(s, SIOCG80211, &i802r) < 0) {
-+			close(s);
-+			continue;
-+		}
-+
-+		close(s);
-+
-+		vsr = (char *) i802r.i_data;
-+		len = i802r.i_len;
-+		while (len >= sizeof(struct ieee80211req_scan_result)) {
-+			struct ieee80211req_scan_result *isr;
-+			char		*id;
-+			int		idlen;
-+			char		ssid[IEEE80211_NWID_LEN+1];
-+
-+			isr = (struct ieee80211req_scan_result *) vsr;
-+
-+			if (isr->isr_meshid_len) {
-+				id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
-+				idlen = isr->isr_meshid_len;
-+			}
-+			else {
-+				id = vsr + isr->isr_ie_off;
-+				idlen = isr->isr_ssid_len;
-+			}
-+			strncpy(ssid, id, idlen);
-+			ssid[idlen] = '\0';
-+			apd.ssid = base::UTF8ToUTF16(ssid);
-+			apd.mac_address = MacAddressAsString16(isr->isr_bssid);
-+			apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise;
-+			apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise;
-+			apd.channel = frquency_to_channel(isr->isr_freq);
-+			VLOG(1) << "FreeBSD access point: "
-+				<< "SSID: " << apd.ssid << ", "
-+				<< "MAC: " << apd.mac_address << ", "
-+				<< "Strength: " << apd.radio_signal_strength << ":"
-+					        << apd.signal_to_noise << ", "
-+				<< "Channel: " << apd.channel;
-+			data->insert(apd);
-+			res = true;
-+			len -= isr->isr_len;
-+			vsr += isr->isr_len;
-+		}
-+        }
-+
-+	freeifaddrs(ifal);
-+
-+	return res;
-+}
-+
-+}  // namespace
-+
-+// static
-+WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() {
-+	return new WifiDataProviderFreeBSD();
-+}
-+
-+WifiDataProviderFreeBSD::WifiDataProviderFreeBSD() {
-+}
-+
-+WifiDataProviderFreeBSD::~WifiDataProviderFreeBSD() {
-+}
-+
-+WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() {
-+
-+	scoped_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD);
-+	if (wlan_api->Init())
-+		return wlan_api.release();
-+
-+	return NULL;
-+}
-+
-+WifiPollingPolicy* WifiDataProviderFreeBSD::NewPollingPolicy() {
-+	return new GenericWifiPollingPolicy<kDefaultPollingInterval,
-+	    kNoChangePollingInterval,
-+	    kTwoNoChangePollingInterval,
-+	    kNoWifiPollingIntervalMilliseconds>;
-+}
-+
-+} // namespace content
diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
deleted file mode 100644
index 3289f4140527..000000000000
--- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h
+++ /dev/null
@@ -1,33 +0,0 @@
---- content/browser/geolocation/wifi_data_provider_freebsd.h.orig	2014-10-13 17:11:09 UTC
-+++ content/browser/geolocation/wifi_data_provider_freebsd.h
-@@ -0,0 +1,30 @@
-+// 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.
-+
-+#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
-+#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
-+
-+#include "base/compiler_specific.h"
-+#include "content/browser/geolocation/wifi_data_provider_common.h"
-+#include "content/common/content_export.h"
-+
-+namespace content {
-+
-+class CONTENT_EXPORT WifiDataProviderFreeBSD : public WifiDataProviderCommon {
-+ public:
-+  WifiDataProviderFreeBSD();
-+
-+ private:
-+  virtual ~WifiDataProviderFreeBSD();
-+
-+  // WifiDataProviderCommon
-+  virtual WlanApiInterface* NewWlanApi() override;
-+  virtual WifiPollingPolicy* NewPollingPolicy() override;
-+
-+  DISALLOW_COPY_AND_ASSIGN(WifiDataProviderFreeBSD);
-+};
-+
-+}  // namespace content
-+
-+#endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
diff --git a/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc b/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
deleted file mode 100644
index 84abc4cef790..000000000000
--- a/www/chromium/files/patch-content__browser__gpu__gpu_data_manager_impl_private.cc
+++ /dev/null
@@ -1,36 +0,0 @@
---- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-03-04 22:36:56.082636647 +0100
-+++ content/browser/gpu/gpu_data_manager_impl_private.cc	2016-03-04 22:37:11.778635557 +0100
-@@ -483,8 +483,10 @@
-   gpu_info.gl_renderer = gl_renderer;
-   gpu_info.gl_version = gl_version;
- 
-+#if !defined(OS_FREEBSD)
-   gpu::IdentifyActiveGPU(&gpu_info);
-   gpu::CollectDriverInfoGL(&gpu_info);
-+#endif
- 
-   UpdateGpuInfo(gpu_info);
-   UpdateGpuSwitchingManager(gpu_info);
-@@ -513,10 +515,12 @@
-     // Also declare the driver_vendor to be osmesa to be able to specify
-     // exceptions based on driver_vendor==osmesa for some blacklist rules.
-     gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
-+#ifndef __FreeBSD__
-   } else {
-     TRACE_EVENT0("startup",
-       "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
-     gpu::CollectBasicGraphicsInfo(&gpu_info);
-+#endif
-   }
- #if defined(ARCH_CPU_X86_FAMILY)
-   if (!gpu_info.gpu.vendor_id || !gpu_info.gpu.device_id) {
-@@ -575,7 +579,9 @@
-     return;
- 
-   bool was_info_available = IsCompleteGpuInfoAvailable();
-+#ifndef __FreeBSD__
-   gpu::MergeGPUInfo(&gpu_info_, gpu_info);
-+#endif
-   if (IsCompleteGpuInfoAvailable()) {
-     complete_gpu_info_already_requested_ = true;
-   } else if (was_info_available) {
diff --git a/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc b/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
deleted file mode 100644
index a0c4645de50c..000000000000
--- a/www/chromium/files/patch-content__browser__indexed_db__indexed_db_backing_store.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/indexed_db/indexed_db_backing_store.cc.orig	2016-03-04 22:40:11.786622515 +0100
-+++ content/browser/indexed_db/indexed_db_backing_store.cc	2016-03-04 22:40:23.035622110 +0100
-@@ -2455,7 +2455,7 @@
-         // The round-trip can be lossy; round to nearest millisecond.
-         int64_t delta =
-             (descriptor.last_modified() - info.last_modified).InMilliseconds();
--        if (std::abs(delta) > 1)
-+        if (std::labs(delta) > 1)
-           return false;
-       }
-       if (!base::TouchFile(path, info.last_accessed, info.last_modified)) {
diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
deleted file mode 100644
index c73ceaf3695a..000000000000
--- a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-01-21 16:05:17.322098582 +0100
-+++ content/browser/renderer_host/render_widget_host_view_aura.cc	2016-01-21 16:08:52.682084606 +0100
-@@ -102,7 +102,7 @@
- #include "ui/gfx/win/dpi.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "content/common/input_messages.h"
- #include "ui/events/linux/text_edit_command_auralinux.h"
- #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -736,7 +736,7 @@
-   if (host)
-     return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget());
- #endif
--  return static_cast<gfx::NativeViewId>(NULL);
-+  return static_cast<gfx::NativeViewId>(0);
- }
- 
- gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
-@@ -2543,7 +2543,7 @@
- }
- 
- bool RenderWidgetHostViewAura::NeedsMouseCapture() {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   return NeedsInputGrab();
- #endif
-   return false;
-@@ -2774,7 +2774,7 @@
-   if (host_->delegate())
-     target_host = host_->delegate()->GetFocusedRenderWidgetHost(host_);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
-   ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate =
-       ui::GetTextEditKeyBindingsDelegate();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
diff --git a/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc b/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
deleted file mode 100644
index 8fa8cfb38cd0..000000000000
--- a/www/chromium/files/patch-content__browser__renderer_host__renderer_process_host_impl.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig	2015-10-14 23:20:02.027419000 +0200
-+++ content/browser/renderer_host/render_process_host_impl.cc	2015-10-14 23:20:29.597226000 +0200
-@@ -38,6 +38,7 @@
- #include "base/tracked_objects.h"
- #include "cc/base/switches.h"
- #include "components/tracing/tracing_switches.h"
-+#include "content/common/bluetooth/bluetooth_scan_filter.h"
- #include "content/browser/appcache/appcache_dispatcher_host.h"
- #include "content/browser/appcache/chrome_appcache_service.h"
- #include "content/browser/background_sync/background_sync_service_impl.h"
diff --git a/www/chromium/files/patch-content__browser__time_zone_monitor.cc b/www/chromium/files/patch-content__browser__time_zone_monitor.cc
deleted file mode 100644
index 9f5e75284a38..000000000000
--- a/www/chromium/files/patch-content__browser__time_zone_monitor.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/browser/time_zone_monitor.cc.orig	2015-08-02 12:15:31.521732000 -0400
-+++ content/browser/time_zone_monitor.cc	2015-08-02 12:16:05.094405000 -0400
-@@ -28,7 +28,7 @@
-   scoped_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
- #else
-   icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // We get here multiple times on Linux per a single tz change, but
-   // want to update the ICU default zone and notify renderer only once.
-   scoped_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
diff --git a/www/chromium/files/patch-content__browser__time_zone_monitor_linux.cc b/www/chromium/files/patch-content__browser__time_zone_monitor_linux.cc
deleted file mode 100644
index 962e8a9352d7..000000000000
--- a/www/chromium/files/patch-content__browser__time_zone_monitor_linux.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- content/browser/time_zone_monitor_linux.cc.orig	2015-05-25 19:00:26 UTC
-+++ content/browser/time_zone_monitor_linux.cc
-@@ -51,6 +51,9 @@
-       : base::RefCountedThreadSafe<TimeZoneMonitorLinuxImpl>(),
-         file_path_watchers_(),
-         owner_(owner) {
-+  }
-+
-+  void StartWatching() {
-     DCHECK_CURRENTLY_ON(BrowserThread::UI);
-     BrowserThread::PostTask(
-         BrowserThread::FILE,
-@@ -147,6 +150,9 @@
-   // changed.
-   if (!getenv("TZ")) {
-     impl_ = new TimeZoneMonitorLinuxImpl(this);
-+    if (impl_.get()) {
-+      impl_->StartWatching();
-+    }
-   }
- }
- 
diff --git a/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc b/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc
deleted file mode 100644
index 2e82003589b2..000000000000
--- a/www/chromium/files/patch-content__common__sandbox_linux__sandbox_debug_handling_linux.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig	2016-03-04 22:42:42.203612627 +0100
-+++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc	2016-03-04 22:43:36.442729525 +0100
-@@ -7,7 +7,9 @@
- #include <errno.h>
- #include <signal.h>
- #include <stddef.h>
-+#if 0 // no OS_FREEBSD here?
- #include <sys/prctl.h>
-+#endif
- #include <unistd.h>
- 
- #include "base/command_line.h"
-@@ -69,12 +71,16 @@
-     return true;
-   }
- 
-+#if 0 // no OS_FREEBSD here?
-   if (prctl(PR_SET_DUMPABLE, 0) != 0) {
-     PLOG(ERROR) << "Failed to set non-dumpable flag";
-     return false;
-   }
- 
-   return prctl(PR_GET_DUMPABLE) == 0;
-+#else
-+  return false;
-+#endif
- }
- 
- }  // namespace content
diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.cc b/www/chromium/files/patch-content__common__set_process_title_linux.cc
deleted file mode 100644
index b8b766cbb9e8..000000000000
--- a/www/chromium/files/patch-content__common__set_process_title_linux.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- content/common/set_process_title_linux.cc.orig	2014-10-10 08:54:14 UTC
-+++ content/common/set_process_title_linux.cc
-@@ -48,6 +48,8 @@
- extern char** environ;
- 
- static char** g_main_argv = NULL;
-+
-+#if !defined(OS_FREEBSD)
- static char* g_orig_argv0 = NULL;
- 
- void setproctitle(const char* fmt, ...) {
-@@ -100,6 +102,7 @@
-   va_end(ap);
-   g_main_argv[1] = NULL;
- }
-+#endif
- 
- // A version of this built into glibc would not need this function, since
- // it could stash the argv pointer in __libc_start_main(). But we need it.
diff --git a/www/chromium/files/patch-content__common__set_process_title_linux.h b/www/chromium/files/patch-content__common__set_process_title_linux.h
deleted file mode 100644
index 1d4c3b93a870..000000000000
--- a/www/chromium/files/patch-content__common__set_process_title_linux.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/common/set_process_title_linux.h.orig	2014-10-10 08:54:14 UTC
-+++ content/common/set_process_title_linux.h
-@@ -5,6 +5,9 @@
- #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
- #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
- 
-+#include "build/build_config.h"
-+
-+#if !defined(OS_FREEBSD)
- // Set the process title that will show in "ps" and similar tools. Takes
- // printf-style format string and arguments. After calling setproctitle()
- // the original main() argv[] array should not be used. By default, the
-@@ -14,6 +17,7 @@
- // This signature and naming is to be compatible with most other Unix
- // implementations of setproctitle().
- void setproctitle(const char* fmt, ...);
-+#endif
- 
- // Initialize state needed for setproctitle() on Linux. Pass the argv pointer
- // from main() to setproctitle_init() before calling setproctitle().
diff --git a/www/chromium/files/patch-content__content_browser.gypi b/www/chromium/files/patch-content__content_browser.gypi
deleted file mode 100644
index 5053c2ee8232..000000000000
--- a/www/chromium/files/patch-content__content_browser.gypi
+++ /dev/null
@@ -1,41 +0,0 @@
---- content/content_browser.gypi.orig	2014-10-10 09:15:31 UTC
-+++ content/content_browser.gypi
-@@ -687,6 +687,8 @@
-       'browser/geolocation/wifi_data_provider_common_win.cc',
-       'browser/geolocation/wifi_data_provider_common_win.h',
-       'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
-+      'browser/geolocation/wifi_data_provider_freebsd.cc',
-+      'browser/geolocation/wifi_data_provider_freebsd.h',
-       'browser/geolocation/wifi_data_provider_linux.cc',
-       'browser/geolocation/wifi_data_provider_linux.h',
-       'browser/geolocation/wifi_data_provider_mac.cc',
-@@ -1818,8 +1820,18 @@
-       ],
-     }],
-     ['os_bsd==1', {
--      'sources/': [
--        ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
-+      'sources!': [
-+        'public/browser/zygote_host_linux.h',
-+        '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',
-+        'browser/device_monitor_linux.cc',
-+        'browser/download/file_metadata_linux.cc',
-+        'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
-+        'browser/geolocation/wifi_data_provider_linux.cc',
-+        'browser/udev_linux.cc',
-       ],
-     }],
-     ['use_aura==1', {
-@@ -1867,7 +1879,7 @@
-         'browser/geolocation/empty_wifi_data_provider.cc',
-       ],
-     }],
--    ['OS == "linux" and use_dbus==1', {
-+    ['(OS == "linux" or os_bsd==1) and use_dbus==1', {
-       'sources!': [
-         'browser/battery_status/battery_status_manager_default.cc',
-         'browser/geolocation/empty_wifi_data_provider.cc',
diff --git a/www/chromium/files/patch-content__content_common.gypi b/www/chromium/files/patch-content__content_common.gypi
deleted file mode 100644
index 5551554149a7..000000000000
--- a/www/chromium/files/patch-content__content_common.gypi
+++ /dev/null
@@ -1,24 +0,0 @@
---- content/content_common.gypi.orig	2014-10-10 09:15:31 UTC
-+++ content/content_common.gypi
-@@ -671,6 +671,21 @@
-         'content.gyp:common_aidl',
-       ],
-     }],
-+    ['os_bsd==1', {
-+      'sources!': [
-+        'common/sandbox_linux.cc',
-+        'common/sandbox_linux.h',
-+        'common/sandbox_init_linux.cc',
-+        'common/sandbox_seccomp_bpf_linux.cc',
-+        'common/sandbox_seccomp_bpf_linux.h',
-+        'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc',
-+        'common/sandbox_linux/bpf_gpu_policy_linux.cc',
-+        'common/sandbox_linux/bpf_ppapi_policy_linux.cc',
-+        'common/sandbox_linux/bpf_renderer_policy_linux.cc',
-+        'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
-+        'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
-+      ],
-+    }],
-     ['use_pango == 1', {
-       'dependencies': [
-         '../build/linux/system.gyp:pangocairo',
diff --git a/www/chromium/files/patch-content__content_tests.gypi b/www/chromium/files/patch-content__content_tests.gypi
deleted file mode 100644
index 2a3ba4b73e49..000000000000
--- a/www/chromium/files/patch-content__content_tests.gypi
+++ /dev/null
@@ -1,18 +0,0 @@
---- content/content_tests.gypi.orig	2016-01-21 16:12:12.019069967 +0100
-+++ content/content_tests.gypi	2016-01-21 16:32:14.310986945 +0100
-@@ -1264,6 +1264,15 @@
-                 '../third_party/libvpx_new/libvpx.gyp:libvpx_new',
-               ],
-             }],
-+            ['OS == "freebsd"', {
-+              'sources!': [
-+                'browser/download/file_metadata_unittest_linux.cc',
-+                'browser/geolocation/wifi_data_provider_linux_unittest.cc',
-+                'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
-+                'browser/renderer_host/media/media_stream_manager_unittest.cc',
-+                'browser/renderer_host/media/media_stream_ui_controller_unittest.cc'
-+              ]
-+            }],
-             # Avoid windows due to non-availability of cursor resources in test.
-             ['OS != "linux"', {
-               'sources!': [
diff --git a/www/chromium/files/patch-content__gpu__gpu_child_thread.cc b/www/chromium/files/patch-content__gpu__gpu_child_thread.cc
deleted file mode 100644
index 4af16809ede5..000000000000
--- a/www/chromium/files/patch-content__gpu__gpu_child_thread.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- content/gpu/gpu_child_thread.cc.orig	2014-10-10 08:54:14 UTC
-+++ content/gpu/gpu_child_thread.cc
-@@ -180,6 +180,7 @@
- }
- 
- void GpuChildThread::OnCollectGraphicsInfo() {
-+#if !defined(OS_FREEBSD)
- #if defined(OS_WIN)
-   // GPU full info collection should only happen on un-sandboxed GPU process
-   // or single process/in-process gpu mode on Windows.
-@@ -222,6 +223,7 @@
-     base::MessageLoop::current()->Quit();
-   }
- #endif  // OS_WIN
-+#endif  // XXX(rene) !FreeBSD
- }
- 
- void GpuChildThread::OnGetVideoMemoryUsageStats() {
diff --git a/www/chromium/files/patch-content__gpu__gpu_main.cc b/www/chromium/files/patch-content__gpu__gpu_main.cc
deleted file mode 100644
index 3f3a8c226099..000000000000
--- a/www/chromium/files/patch-content__gpu__gpu_main.cc
+++ /dev/null
@@ -1,45 +0,0 @@
---- content/gpu/gpu_main.cc.orig	2015-07-15 16:30:03.000000000 -0400
-+++ content/gpu/gpu_main.cc	2015-07-22 06:59:18.148443000 -0400
-@@ -81,7 +81,7 @@
-                                const base::CommandLine& command_line);
- bool WarmUpSandbox(const base::CommandLine& command_line);
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
- bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
- #endif
- 
-@@ -163,13 +163,13 @@
-   // Use a UI message loop because ANGLE and the desktop GL platform can
-   // create child windows to render to.
-   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
--#elif defined(OS_LINUX) && defined(USE_X11)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)
-   // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
-   // and https://crbug.com/326995.
-   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
-   scoped_ptr<ui::PlatformEventSource> event_source =
-       ui::PlatformEventSource::CreateDefault();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
- #elif defined(OS_MACOSX)
-   // This is necessary for CoreAnimation layers hosted in the GPU process to be
-@@ -274,7 +274,7 @@
-       // and we already registered them through SetGpuInfo() above.
-       base::TimeTicks before_collect_context_graphics_info =
-           base::TimeTicks::Now();
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
-       if (!CollectGraphicsInfo(gpu_info))
-         dead_on_arrival = true;
- 
-@@ -408,7 +408,7 @@
-   return true;
- }
- 
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD
- bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
-   bool res = true;
-   gpu::CollectInfoResult result = gpu::CollectContextGraphicsInfo(&gpu_info);
diff --git a/www/chromium/files/patch-content__public__common__content_switches.cc b/www/chromium/files/patch-content__public__common__content_switches.cc
deleted file mode 100644
index 0a88ff8d4b7a..000000000000
--- a/www/chromium/files/patch-content__public__common__content_switches.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/public/common/content_switches.cc.orig	2014-10-10 09:15:31 UTC
-+++ content/public/common/content_switches.cc
-@@ -924,7 +924,7 @@
-     "disable-vaapi-accelerated-video-encode";
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- // Allows sending text-to-speech requests to speech-dispatcher, a common
- // Linux speech service. Because it's buggy, the user must explicitly
- // enable it so that visiting a random webpage can't cause instability.
diff --git a/www/chromium/files/patch-content__public__common__content_switches.h b/www/chromium/files/patch-content__public__common__content_switches.h
deleted file mode 100644
index 036d21c5ac35..000000000000
--- a/www/chromium/files/patch-content__public__common__content_switches.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/public/common/content_switches.h.orig	2014-10-10 09:15:31 UTC
-+++ content/public/common/content_switches.h
-@@ -268,7 +268,7 @@
- CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
- #endif
- 
diff --git a/www/chromium/files/patch-content__public__test__browser_test_base.cc b/www/chromium/files/patch-content__public__test__browser_test_base.cc
deleted file mode 100644
index 73454dc8d516..000000000000
--- a/www/chromium/files/patch-content__public__test__browser_test_base.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- content/public/test/browser_test_base.cc.orig	2014-10-10 09:15:31 UTC
-+++ content/public/test/browser_test_base.cc
-@@ -4,6 +4,10 @@
- 
- #include "content/public/test/browser_test_base.h"
- 
-+#if defined(OS_FREEBSD)
-+#include <sys/signal.h>
-+#endif
-+
- #include "base/bind.h"
- #include "base/command_line.h"
- #include "base/debug/stack_trace.h"
diff --git a/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc b/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc
deleted file mode 100644
index af4a3e1571b1..000000000000
--- a/www/chromium/files/patch-content__renderer__devtools__v8_sampling_profiler.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- content/renderer/devtools/v8_sampling_profiler.cc.orig	2015-05-21 09:58:46.394686000 -0400
-+++ content/renderer/devtools/v8_sampling_profiler.cc	2015-05-21 10:11:21.858314000 -0400
-@@ -534,6 +534,10 @@
-   state.pc = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rip, __eip));
-   state.sp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rsp, __esp));
-   state.fp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rbp, __ebp));
-+#elif defined(OS_FREEBSD)
-+  state.pc = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rip, mc_eip));
-+  state.sp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rsp, mc_esp));
-+  state.fp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rbp, mc_ebp));
- #else
-   state.pc =
-       reinterpret_cast<void*>(mcontext.gregs[REG_64_32(REG_RIP, REG_EIP)]);
diff --git a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc b/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
deleted file mode 100644
index 45444e9692cd..000000000000
--- a/www/chromium/files/patch-content__renderer__media__webrtc_audio_capturer.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- content/renderer/media/webrtc_audio_capturer.cc.orig	2014-10-10 09:15:31 UTC
-+++ content/renderer/media/webrtc_audio_capturer.cc
-@@ -448,8 +448,8 @@
- // CaptureCallback.
- #if defined(OS_WIN) || defined(OS_MACOSX)
-   DCHECK_LE(volume, 1.0);
--#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
--  // We have a special situation on Linux where the microphone volume can be
-+#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
-+  // We have a special situation on POSIX where the microphone volume can be
-   // "higher than maximum". The input volume slider in the sound preference
-   // allows the user to set a scaling that is higher than 100%. It means that
-   // even if the reported maximum levels is N, the actual microphone level can
diff --git a/www/chromium/files/patch-content__renderer__render_thread_impl.cc b/www/chromium/files/patch-content__renderer__render_thread_impl.cc
deleted file mode 100644
index 612dfeb48714..000000000000
--- a/www/chromium/files/patch-content__renderer__render_thread_impl.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/renderer/render_thread_impl.cc.orig	2015-09-01 16:10:42.000000000 -0400
-+++ content/renderer/render_thread_impl.cc	2015-09-03 10:37:57.364787000 -0400
-@@ -768,7 +768,7 @@
-   is_gather_pixel_refs_enabled_ = num_raster_threads > 1;
- 
-   base::SimpleThread::Options thread_options;
--#if defined(OS_ANDROID) || defined(OS_LINUX)
-+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
-   if (!command_line.HasSwitch(
-           switches::kUseNormalPriorityForTileTaskWorkerThreads)) {
-     thread_options.set_priority(base::ThreadPriority::BACKGROUND);
diff --git a/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc b/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
deleted file mode 100644
index 55c868c8e841..000000000000
--- a/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc
+++ /dev/null
@@ -1,65 +0,0 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig	2016-01-21 16:33:48.151980879 +0100
-+++ content/renderer/renderer_blink_platform_impl.cc	2016-01-21 16:36:48.239968431 +0100
-@@ -108,7 +108,7 @@
- 
- #if defined(OS_POSIX)
- #include "base/file_descriptor_posix.h"
--#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
-+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- #include <map>
- #include <string>
- 
-@@ -199,7 +199,7 @@
-   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
- };
- 
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
- class RendererBlinkPlatformImpl::SandboxSupport
-     : public blink::WebSandboxSupport {
-  public:
-@@ -226,7 +226,7 @@
-   std::map<int32_t, blink::WebFallbackFont> unicode_font_families_;
- #endif
- };
--#endif  // !defined(OS_ANDROID) && !defined(OS_WIN)
-+#endif  // !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
- 
- //------------------------------------------------------------------------------
- 
-@@ -243,7 +243,7 @@
-       loading_task_runner_(renderer_scheduler->LoadingTaskRunner()),
-       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
-       renderer_scheduler_(renderer_scheduler) {
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
-   if (g_sandbox_enabled && sandboxEnabled()) {
-     sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
-   } else {
-@@ -268,7 +268,7 @@
- }
- 
- void RendererBlinkPlatformImpl::Shutdown() {
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
-   // SandboxSupport contains a map of WebFontFamily objects, which hold
-   // WebCStrings, which become invalidated when blink is shut down. Hence, we
-   // need to clear that map now, just before blink::shutdown() is called.
-@@ -328,7 +328,7 @@
- }
- 
- blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
--#if defined(OS_ANDROID) || defined(OS_WIN)
-+#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_BSD)
-   // These platforms do not require sandbox support.
-   return NULL;
- #else
-@@ -598,7 +598,7 @@
-   return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
- }
- 
--#elif defined(OS_POSIX) && !defined(OS_ANDROID)
-+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD)
- 
- void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
-     blink::WebUChar32 character,
diff --git a/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h b/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h
deleted file mode 100644
index f8608861c6c5..000000000000
--- a/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/renderer/renderer_blink_platform_impl.h.orig	2015-05-21 10:17:35.674995000 -0400
-+++ content/renderer/renderer_blink_platform_impl.h	2015-05-21 10:17:56.809792000 -0400
-@@ -218,7 +218,7 @@
-   class MimeRegistry;
-   scoped_ptr<MimeRegistry> mime_registry_;
- 
--#if !defined(OS_ANDROID) && !defined(OS_WIN)
-+#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
-   class SandboxSupport;
-   scoped_ptr<SandboxSupport> sandbox_support_;
- #endif
diff --git a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc b/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
deleted file mode 100644
index 344ffc236b8d..000000000000
--- a/www/chromium/files/patch-content__renderer__renderer_main_platform_delegate_linux.cc
+++ /dev/null
@@ -1,19 +0,0 @@
---- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2014-10-10 08:54:15 UTC
-+++ content/renderer/renderer_main_platform_delegate_linux.cc
-@@ -40,6 +40,7 @@
- }
- 
- bool RendererMainPlatformDelegate::EnableSandbox() {
-+#if !defined(OS_BSD)
-   // The setuid sandbox is started in the zygote process: zygote_main_linux.cc
-   // http://code.google.com/p/chromium/wiki/LinuxSUIDSandbox
-   //
-@@ -70,7 +71,7 @@
-     CHECK_EQ(errno, EPERM);
-   }
- #endif  // __x86_64__
--
-+#endif  // ! OS_BSD
-   return true;
- }
- 
diff --git a/www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc b/www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc
deleted file mode 100644
index 782577596c88..000000000000
--- a/www/chromium/files/patch-content__renderer__webscrollbarbehavior_impl_gtkoraura.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig	2015-04-14 18:18:54.000000000 -0400
-+++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc	2015-04-28 09:19:06.077932000 -0400
-@@ -13,7 +13,7 @@
-       blink::WebScrollbarBehavior::Button mouseButton,
-       bool shiftKeyPressed,
-       bool altKeyPressed) {
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   if (mouseButton == blink::WebScrollbarBehavior::ButtonMiddle)
-     return true;
- #endif
-@@ -49,7 +49,7 @@
-   // On most platforms, we should snap iff the event is outside our calculated
-   // rect.  On Linux, however, we should not snap for events off the ends, but
-   // not the sides, of the rect.
--#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   return isHorizontal ?
-       (eventPoint.y < noSnapRect.y() || eventPoint.y >= noSnapRect.bottom()) :
-       (eventPoint.x < noSnapRect.x() || eventPoint.x >= noSnapRect.right());
diff --git a/www/chromium/files/patch-content__shell__browser__shell_browser_context.cc b/www/chromium/files/patch-content__shell__browser__shell_browser_context.cc
deleted file mode 100644
index 0ae53ed88eb0..000000000000
--- a/www/chromium/files/patch-content__shell__browser__shell_browser_context.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/shell/browser/shell_browser_context.cc.orig	2015-04-28 09:16:12.316318000 -0400
-+++ content/shell/browser/shell_browser_context.cc	2015-04-28 09:16:42.961522000 -0400
-@@ -19,7 +19,7 @@
- 
- #if defined(OS_WIN)
- #include "base/base_paths_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "base/nix/xdg_util.h"
- #elif defined(OS_MACOSX)
- #include "base/base_paths_mac.h"
-@@ -74,7 +74,7 @@
- #if defined(OS_WIN)
-   CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
-   path_ = path_.Append(std::wstring(L"content_shell"));
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   scoped_ptr<base::Environment> env(base::Environment::Create());
-   base::FilePath config_dir(
-       base::nix::GetXDGDirectory(env.get(),
diff --git a/www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc b/www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc
deleted file mode 100644
index b1b596244d23..000000000000
--- a/www/chromium/files/patch-content__shell__browser__shell_browser_main_parts.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig	2015-04-14 18:18:54.000000000 -0400
-+++ content/shell/browser/shell_browser_main_parts.cc	2015-04-28 09:14:47.212411000 -0400
-@@ -38,7 +38,7 @@
- #if defined(USE_AURA) && defined(USE_X11)
- #include "ui/events/devices/x11/touch_factory_x11.h"
- #endif
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
- #include "ui/base/ime/input_method_initializer.h"
- #endif
- 
-@@ -105,7 +105,7 @@
- }
- 
- void ShellBrowserMainParts::PreEarlyInitialization() {
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
-   ui::InitializeInputMethodForTesting();
- #endif
- #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-content_app_content__main__runner.cc b/www/chromium/files/patch-content_app_content__main__runner.cc
new file mode 100644
index 000000000000..c197a2277562
--- /dev/null
+++ b/www/chromium/files/patch-content_app_content__main__runner.cc
@@ -0,0 +1,42 @@
+--- content/app/content_main_runner.cc.orig	2016-05-11 19:02:20 UTC
++++ content/app/content_main_runner.cc
+@@ -98,10 +98,10 @@
+ #include "base/posix/global_descriptors.h"
+ #include "content/public/common/content_descriptors.h"
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "content/public/common/zygote_fork_delegate_linux.h"
+ #endif
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ #include "content/zygote/zygote_main.h"
+ #endif
+ 
+@@ -273,7 +273,7 @@ struct MainFunction {
+   int (*function)(const MainFunctionParams&);
+ };
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ // On platforms that use the zygote, we have a special subset of
+ // subprocesses that are launched via the zygote.  This function
+ // fills in some process-launching bits around ZygoteMain().
+@@ -322,7 +322,7 @@ int RunZygote(const MainFunctionParams& 
+   NOTREACHED() << "Unknown zygote process type: " << process_type;
+   return 1;
+ }
+-#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ 
+ #if !defined(OS_IOS)
+ static void RegisterMainThreadFactories() {
+@@ -396,7 +396,7 @@ int RunNamedProcessTypeMain(
+     }
+   }
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   // Zygote startup is special -- see RunZygote comments above
+   // for why we don't use ZygoteMain directly.
+   if (process_type == switches::kZygoteProcess)
diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h
new file mode 100644
index 000000000000..22f297d07c95
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility.h
@@ -0,0 +1,20 @@
+--- content/browser/accessibility/browser_accessibility.h.orig	2016-05-25 15:01:01.000000000 -0400
++++ content/browser/accessibility/browser_accessibility.h	2016-05-27 10:16:53.216804000 -0400
+@@ -38,7 +38,7 @@
+ #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
+ #endif
+ 
+-#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS)
+ #define PLATFORM_HAS_NATIVE_ACCESSIBILITY_IMPL 1
+ #endif
+ 
+@@ -50,7 +50,7 @@
+ class BrowserAccessibilityManager;
+ #if defined(OS_WIN)
+ class BrowserAccessibilityWin;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
+ class BrowserAccessibilityAuraLinux;
+ #endif
+ 
diff --git a/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
new file mode 100644
index 000000000000..cc695ac82a22
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_accessibility_browser__accessibility__manager.h
@@ -0,0 +1,20 @@
+--- content/browser/accessibility/browser_accessibility_manager.h.orig	2016-05-21 11:59:58 UTC
++++ content/browser/accessibility/browser_accessibility_manager.h
+@@ -31,7 +31,7 @@ class BrowserAccessibilityManager;
+ class BrowserAccessibilityManagerAndroid;
+ #elif defined(OS_WIN)
+ class BrowserAccessibilityManagerWin;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
+ class BrowserAccessibilityManagerAuraLinux;
+ #endif
+ 
+@@ -244,7 +244,7 @@ class CONTENT_EXPORT BrowserAccessibilit
+   BrowserAccessibilityManagerAndroid* ToBrowserAccessibilityManagerAndroid();
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
+   BrowserAccessibilityManagerAuraLinux*
+       ToBrowserAccessibilityManagerAuraLinux();
+ #endif
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
new file mode 100644
index 000000000000..7ba36644a563
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -0,0 +1,20 @@
+--- content/browser/browser_main_loop.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/browser_main_loop.cc
+@@ -191,7 +191,7 @@
+ namespace content {
+ namespace {
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+ void SetupSandbox(const base::CommandLine& parsed_command_line) {
+   TRACE_EVENT0("startup", "SetupSandbox");
+   base::FilePath sandbox_binary;
+@@ -444,7 +444,7 @@ void BrowserMainLoop::EarlyInitializatio
+   TRACE_EVENT0("startup", "BrowserMainLoop::EarlyInitialization");
+   TRACK_SCOPED_REGION("Startup", "BrowserMainLoop::EarlyInitialization");
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   // No thread should be created before this call, as SetupSandbox()
+   // will end-up using fork().
+   SetupSandbox(parsed_command_line_);
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher.cc b/www/chromium/files/patch-content_browser_child__process__launcher.cc
new file mode 100644
index 000000000000..e3cd58cfbb92
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_child__process__launcher.cc
@@ -0,0 +1,38 @@
+--- content/browser/child_process_launcher.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/child_process_launcher.cc
+@@ -229,7 +229,7 @@ void LaunchOnLauncherThread(const Notify
+   // We need to close the client end of the IPC channel to reliably detect
+   // child termination.
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+   ZygoteHandle* zygote_handle = delegate->GetZygote();
+   // If |zygote_handle| is null, a zygote should not be used.
+   if (zygote_handle) {
+@@ -333,7 +333,7 @@ void TerminateOnLauncherThread(ZygoteHan
+   process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
+   // On POSIX, we must additionally reap the child.
+ #if defined(OS_POSIX)
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+   if (zygote) {
+     // If the renderer was created via a zygote, we have to proxy the reaping
+     // through the zygote process.
+@@ -435,7 +435,7 @@ void ChildProcessLauncher::Launch(
+ 
+ void ChildProcessLauncher::UpdateTerminationStatus(bool known_dead) {
+   DCHECK(CalledOnValidThread());
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   if (zygote_) {
+     termination_status_ = zygote_->GetTerminationStatus(
+         process_.Handle(), known_dead, &exit_code_);
+@@ -505,7 +505,7 @@ void ChildProcessLauncher::Notify(Zygote
+   starting_ = false;
+   process_ = std::move(process);
+ 
+-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   zygote_ = zygote;
+ #endif
+   if (process_.IsValid()) {
diff --git a/www/chromium/files/patch-content_browser_download_base__file.cc b/www/chromium/files/patch-content_browser_download_base__file.cc
new file mode 100644
index 000000000000..6ff17e7504de
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_download_base__file.cc
@@ -0,0 +1,12 @@
+--- content/browser/download/base_file.cc.orig	2016-05-25 15:01:01.000000000 -0400
++++ content/browser/download/base_file.cc	2016-05-27 10:51:20.693194000 -0400
+@@ -186,7 +186,8 @@
+ }
+ 
+ // OS_WIN, OS_MACOSX and OS_LINUX have specialized implementations.
+-#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
++#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && \
++    !defined(OS_BSD)
+ DownloadInterruptReason BaseFile::AnnotateWithSourceInformation(
+     const std::string& client_guid,
+     const GURL& source_url,
diff --git a/www/chromium/files/patch-content_browser_download_base__file__linux.cc b/www/chromium/files/patch-content_browser_download_base__file__linux.cc
new file mode 100644
index 000000000000..d5430d3826cb
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_download_base__file__linux.cc
@@ -0,0 +1,12 @@
+--- content/browser/download/base_file_linux.cc.orig	2016-05-24 22:54:15.000000000 -0400
++++ content/browser/download/base_file_linux.cc	2016-05-27 10:52:35.163174000 -0400
+@@ -16,7 +16,9 @@
+   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+   DCHECK(!detached_);
+ 
++#if !defined(OS_BSD)
+   AddOriginMetadataToFile(full_path_, source_url, referrer_url);
++#endif
+   return DOWNLOAD_INTERRUPT_REASON_NONE;
+ }
+ 
diff --git a/www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc b/www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc
new file mode 100644
index 000000000000..c99211cc3b4b
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_geolocation_location__arbitrator__impl.cc
@@ -0,0 +1,11 @@
+--- content/browser/geolocation/location_arbitrator_impl.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/geolocation/location_arbitrator_impl.cc
+@@ -163,7 +163,7 @@ LocationProvider* LocationArbitratorImpl
+ }
+ 
+ LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
+-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD)
+   return NULL;
+ #else
+   return content::NewSystemLocationProvider();
diff --git a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc
new file mode 100644
index 000000000000..4b019d35566b
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.cc
@@ -0,0 +1,204 @@
+--- content/browser/geolocation/wifi_data_provider_freebsd.cc.orig	2016-05-20 17:18:26 UTC
++++ content/browser/geolocation/wifi_data_provider_freebsd.cc
+@@ -0,0 +1,201 @@
++// Copyright (c) 2010 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.
++
++// For FreeBSD we use the getifaddrs(3) to obtain the list of interfaces
++// and then check for those with an 802.11 media type and able to return
++// a list of stations.  This is similar to ifconfig(8).
++
++#include "content/browser/geolocation/wifi_data_provider_freebsd.h"
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/sockio.h>
++#include <net/if.h>
++#include <net/if_media.h>
++#include <ifaddrs.h>
++#include <net80211/ieee80211_ioctl.h>
++#include <net/ethernet.h>
++
++#include "base/strings/utf_string_conversions.h"
++#include "content/browser/geolocation/wifi_data_provider_common.h"
++#include "content/browser/geolocation/wifi_data_provider_manager.h"
++
++namespace content {
++namespace {
++// The time periods, in milliseconds, between successive polls of the wifi data.
++const int kDefaultPollingInterval = 10000;  // 10s
++const int kNoChangePollingInterval = 120000;  // 2 mins
++const int kTwoNoChangePollingInterval = 600000;  // 10 mins
++const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
++
++// Convert a wifi frequency to the corresponding channel.
++// Taken from wifi_data_provider_linux.cc where it says this was
++// adapted from geolocaiton/wifilib.cc in googleclient (internal to google).
++int frquency_to_channel(int frequency_Mhz) {
++	if (frequency_Mhz >= 2412 && frequency_Mhz <= 2472)  // Channels 1-13.
++		return (frequency_Mhz - 2407) / 5;
++	if (frequency_Mhz == 2484)
++		return 14;
++	if (frequency_Mhz > 5000 && frequency_Mhz < 6000)  // .11a bands.
++		return (frequency_Mhz - 5000) / 5;
++	// Ignore everything else.
++	return AccessPointData().channel;  // invalid channel
++}
++
++// Provides the wifi API binding for FreeBSD.
++class AccessPointDataFreeBSD : public WifiDataProviderCommon::WlanApiInterface {
++public:
++	AccessPointDataFreeBSD();
++	~AccessPointDataFreeBSD();
++
++	// this does nothing
++	bool Init();
++
++	// get the AP data
++	virtual bool GetAccessPointData(WifiData::AccessPointDataSet* data);
++
++private:
++	DISALLOW_COPY_AND_ASSIGN(AccessPointDataFreeBSD);
++};
++
++AccessPointDataFreeBSD::AccessPointDataFreeBSD() {
++}
++
++AccessPointDataFreeBSD::~AccessPointDataFreeBSD() {
++}
++
++bool AccessPointDataFreeBSD::Init() {
++	return true;
++}
++
++bool AccessPointDataFreeBSD::GetAccessPointData(WifiData::AccessPointDataSet* data) {
++	bool			res;
++	char			*dupn;
++	struct ifaddrs		*ifal, *ifa;
++	struct ifreq		ifr;
++	struct ifmediareq	ifmr;
++	struct ieee80211req 	i802r;
++	int			s;
++	char			iscanbuf[32*1024], *vsr;
++	unsigned		len;
++	AccessPointData		apd;
++
++	res = false;
++	if (getifaddrs(&ifal) < 0)
++		return res;
++
++	dupn = NULL;
++	for (ifa = ifal; ifa; ifa = ifa->ifa_next) {
++		memset(&ifr, 0, sizeof(ifr));
++
++		if (dupn != NULL && strcmp(dupn, ifa->ifa_name) == 0)
++			continue;
++		dupn = ifa->ifa_name;
++
++		strncpy(ifr.ifr_name, ifa->ifa_name, sizeof(ifr.ifr_name));
++		ifr.ifr_addr.sa_family = AF_LOCAL;
++
++		if ((s = socket(ifr.ifr_addr.sa_family, SOCK_DGRAM, 0)) < 0)
++			continue;
++
++		(void) memset(&ifmr, 0, sizeof(ifmr));
++		(void) strncpy(ifmr.ifm_name, ifa->ifa_name, sizeof(ifmr.ifm_name));
++
++		if (ioctl(s, SIOCGIFMEDIA, (caddr_t)&ifmr) < 0) {
++			close(s);
++			continue;
++		}
++		if (IFM_TYPE(ifmr.ifm_active) != IFM_IEEE80211) {
++			close(s);
++			continue;
++		}
++
++		(void) memset(&i802r, 0, sizeof(i802r));
++		(void) strncpy(i802r.i_name, ifa->ifa_name, sizeof(i802r.i_name));
++		i802r.i_type = IEEE80211_IOC_SCAN_RESULTS;
++		i802r.i_data = iscanbuf;
++		i802r.i_len = sizeof(iscanbuf);
++		if (ioctl(s, SIOCG80211, &i802r) < 0) {
++			close(s);
++			continue;
++		}
++
++		close(s);
++
++		vsr = (char *) i802r.i_data;
++		len = i802r.i_len;
++		while (len >= sizeof(struct ieee80211req_scan_result)) {
++			struct ieee80211req_scan_result *isr;
++			char		*id;
++			int		idlen;
++			char		ssid[IEEE80211_NWID_LEN+1];
++
++			isr = (struct ieee80211req_scan_result *) vsr;
++
++			if (isr->isr_meshid_len) {
++				id = vsr + isr->isr_ie_off + isr->isr_ssid_len;
++				idlen = isr->isr_meshid_len;
++			}
++			else {
++				id = vsr + isr->isr_ie_off;
++				idlen = isr->isr_ssid_len;
++			}
++			strncpy(ssid, id, idlen);
++			ssid[idlen] = '\0';
++			apd.ssid = base::UTF8ToUTF16(ssid);
++			apd.mac_address = MacAddressAsString16(isr->isr_bssid);
++			apd.radio_signal_strength = (isr->isr_rssi/2) + isr->isr_noise;
++			apd.signal_to_noise = apd.radio_signal_strength - isr->isr_noise;
++			apd.channel = frquency_to_channel(isr->isr_freq);
++			VLOG(1) << "FreeBSD access point: "
++				<< "SSID: " << apd.ssid << ", "
++				<< "MAC: " << apd.mac_address << ", "
++				<< "Strength: " << apd.radio_signal_strength << ":"
++					        << apd.signal_to_noise << ", "
++				<< "Channel: " << apd.channel;
++			data->insert(apd);
++			res = true;
++			len -= isr->isr_len;
++			vsr += isr->isr_len;
++		}
++        }
++
++	freeifaddrs(ifal);
++
++	return res;
++}
++
++}  // namespace
++
++// static
++WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() {
++	return new WifiDataProviderFreeBSD();
++}
++
++WifiDataProviderFreeBSD::WifiDataProviderFreeBSD() {
++}
++
++WifiDataProviderFreeBSD::~WifiDataProviderFreeBSD() {
++}
++
++WifiDataProviderCommon::WlanApiInterface* WifiDataProviderFreeBSD::NewWlanApi() {
++
++	scoped_ptr<AccessPointDataFreeBSD> wlan_api(new AccessPointDataFreeBSD);
++	if (wlan_api->Init())
++		return wlan_api.release();
++
++	return NULL;
++}
++
++WifiPollingPolicy* WifiDataProviderFreeBSD::NewPollingPolicy() {
++	return new GenericWifiPollingPolicy<kDefaultPollingInterval,
++	    kNoChangePollingInterval,
++	    kTwoNoChangePollingInterval,
++	    kNoWifiPollingIntervalMilliseconds>;
++}
++
++} // namespace content
diff --git a/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h
new file mode 100644
index 000000000000..29307082f6ad
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_geolocation_wifi__data__provider__freebsd.h
@@ -0,0 +1,33 @@
+--- content/browser/geolocation/wifi_data_provider_freebsd.h.orig	2016-05-20 17:18:26 UTC
++++ content/browser/geolocation/wifi_data_provider_freebsd.h
+@@ -0,0 +1,30 @@
++// 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.
++
++#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
++#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
++
++#include "base/compiler_specific.h"
++#include "content/browser/geolocation/wifi_data_provider_common.h"
++#include "content/common/content_export.h"
++
++namespace content {
++
++class CONTENT_EXPORT WifiDataProviderFreeBSD : public WifiDataProviderCommon {
++ public:
++  WifiDataProviderFreeBSD();
++
++ private:
++  virtual ~WifiDataProviderFreeBSD();
++
++  // WifiDataProviderCommon
++  virtual WlanApiInterface* NewWlanApi() override;
++  virtual WifiPollingPolicy* NewPollingPolicy() override;
++
++  DISALLOW_COPY_AND_ASSIGN(WifiDataProviderFreeBSD);
++};
++
++}  // namespace content
++
++#endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_FREEBSD_H_
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
new file mode 100644
index 000000000000..c64b927b3136
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -0,0 +1,36 @@
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/gpu/gpu_data_manager_impl_private.cc
+@@ -486,8 +486,10 @@ void GpuDataManagerImplPrivate::SetGLStr
+   gpu_info.gl_renderer = gl_renderer;
+   gpu_info.gl_version = gl_version;
+ 
++#if !defined(OS_FREEBSD)
+   gpu::IdentifyActiveGPU(&gpu_info);
+   gpu::CollectDriverInfoGL(&gpu_info);
++#endif
+ 
+   UpdateGpuInfo(gpu_info);
+   UpdateGpuSwitchingManager(gpu_info);
+@@ -529,10 +531,12 @@ void GpuDataManagerImplPrivate::Initiali
+     // Also declare the driver_vendor to be osmesa to be able to specify
+     // exceptions based on driver_vendor==osmesa for some blacklist rules.
+     gpu_info.driver_vendor = gfx::kGLImplementationOSMesaName;
++#ifndef __FreeBSD__
+   } else {
+     TRACE_EVENT0("startup",
+       "GpuDataManagerImpl::Initialize:CollectBasicGraphicsInfo");
+     gpu::CollectBasicGraphicsInfo(&gpu_info);
++#endif
+ 
+     if (command_line->HasSwitch(switches::kGpuTestingVendorId) &&
+         command_line->HasSwitch(switches::kGpuTestingDeviceId)) {
+@@ -631,7 +635,9 @@ void GpuDataManagerImplPrivate::UpdateGp
+     return;
+ 
+   bool was_info_available = IsCompleteGpuInfoAvailable();
++#ifndef __FreeBSD__
+   gpu::MergeGPUInfo(&gpu_info_, gpu_info);
++#endif
+   if (IsCompleteGpuInfoAvailable()) {
+     complete_gpu_info_already_requested_ = true;
+   } else if (was_info_available) {
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
new file mode 100644
index 000000000000..56a5da9a93e3
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__internals__ui.cc
@@ -0,0 +1,29 @@
+--- content/browser/gpu/gpu_internals_ui.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/gpu/gpu_internals_ui.cc
+@@ -37,7 +37,7 @@
+ #include "third_party/angle/src/common/version.h"
+ #include "ui/gl/gpu_switching_manager.h"
+ 
+-#if defined(OS_LINUX) && defined(USE_X11)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
+ #include <X11/Xlib.h>
+ #endif
+ #if defined(OS_WIN)
+@@ -45,7 +45,7 @@
+ #include "ui/gfx/win/physical_size.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && defined(USE_X11)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
+ #include "ui/base/x/x11_util.h"
+ #include "ui/gfx/x/x11_atom_cache.h"
+ #endif
+@@ -198,7 +198,7 @@ base::DictionaryValue* GpuInfoAsDictiona
+                                              gpu_info.gl_ws_version));
+   basic_info->Append(NewDescriptionValuePair("Window system binding extensions",
+                                              gpu_info.gl_ws_extensions));
+-#if defined(OS_LINUX) && defined(USE_X11)
++#if (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11)
+   basic_info->Append(NewDescriptionValuePair("Window manager",
+                                              ui::GuessWindowManagerName()));
+   {
diff --git a/www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc b/www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc
new file mode 100644
index 000000000000..0ba4c02d4e74
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_indexed__db_indexed__db__backing__store.cc
@@ -0,0 +1,11 @@
+--- content/browser/indexed_db/indexed_db_backing_store.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/indexed_db/indexed_db_backing_store.cc
+@@ -2433,7 +2433,7 @@ bool IndexedDBBackingStore::WriteBlobFil
+         // The round-trip can be lossy; round to nearest millisecond.
+         int64_t delta =
+             (descriptor.last_modified() - info.last_modified).InMilliseconds();
+-        if (std::abs(delta) > 1)
++        if (std::labs(delta) > 1)
+           return false;
+       }
+       if (!base::TouchFile(path, info.last_accessed, info.last_modified)) {
diff --git a/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
new file mode 100644
index 000000000000..21ed460107cd
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_ppapi__plugin__process__host.cc
@@ -0,0 +1,29 @@
+--- content/browser/ppapi_plugin_process_host.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/ppapi_plugin_process_host.cc
+@@ -49,7 +49,7 @@
+ 
+ namespace content {
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ ZygoteHandle g_ppapi_zygote;
+ #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+ 
+@@ -113,7 +113,7 @@ class PpapiPluginSandboxedProcessLaunche
+   }
+ 
+ #elif defined(OS_POSIX)
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   ZygoteHandle* GetZygote() override {
+     const base::CommandLine& browser_command_line =
+         *base::CommandLine::ForCurrentProcess();
+@@ -213,7 +213,7 @@ PpapiPluginProcessHost* PpapiPluginProce
+   return NULL;
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ // static
+ void PpapiPluginProcessHost::EarlyZygoteLaunch() {
+   DCHECK(!g_ppapi_zygote);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
new file mode 100644
index 000000000000..163246eac30c
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -0,0 +1,29 @@
+--- content/browser/renderer_host/render_process_host_impl.cc.orig	2016-05-20 17:18:26 UTC
++++ content/browser/renderer_host/render_process_host_impl.cc
+@@ -366,7 +366,7 @@ SiteProcessMap* GetSiteProcessMapForBrow
+   return map;
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ // This static member variable holds the zygote communication information for
+ // the renderer.
+ ZygoteHandle g_render_zygote;
+@@ -399,7 +399,7 @@ class RendererSandboxedProcessLauncherDe
+   }
+ 
+ #elif defined(OS_POSIX)
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   ZygoteHandle* GetZygote() override {
+     const base::CommandLine& browser_command_line =
+         *base::CommandLine::ForCurrentProcess();
+@@ -539,7 +539,7 @@ void RenderProcessHost::SetMaxRendererPr
+   g_max_renderer_count_override = count;
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ // static
+ void RenderProcessHostImpl::EarlyZygoteLaunch() {
+   DCHECK(!g_render_zygote);
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
new file mode 100644
index 000000000000..a66100291da3
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -0,0 +1,38 @@
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig	2016-05-11 19:02:20 UTC
++++ content/browser/renderer_host/render_widget_host_view_aura.cc
+@@ -107,7 +107,7 @@
+ #include "ui/gfx/win/dpi.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "content/common/input_messages.h"
+ #include "ui/events/linux/text_edit_command_auralinux.h"
+ #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
+@@ -734,7 +734,7 @@ gfx::NativeViewId RenderWidgetHostViewAu
+   if (host)
+     return reinterpret_cast<gfx::NativeViewId>(host->GetAcceleratedWidget());
+ #endif
+-  return static_cast<gfx::NativeViewId>(NULL);
++  return static_cast<gfx::NativeViewId>(0);
+ }
+ 
+ gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() {
+@@ -2626,7 +2626,7 @@ bool RenderWidgetHostViewAura::NeedsInpu
+ }
+ 
+ bool RenderWidgetHostViewAura::NeedsMouseCapture() {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   return NeedsInputGrab();
+ #endif
+   return false;
+@@ -2859,7 +2859,7 @@ void RenderWidgetHostViewAura::ForwardKe
+   if (!target_host)
+     return;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
+   ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate =
+       ui::GetTextEditKeyBindingsDelegate();
+   std::vector<ui::TextEditCommandAuraLinux> commands;
diff --git a/www/chromium/files/patch-content_browser_time__zone__monitor.cc b/www/chromium/files/patch-content_browser_time__zone__monitor.cc
new file mode 100644
index 000000000000..bfd52ebfc30d
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_time__zone__monitor.cc
@@ -0,0 +1,11 @@
+--- content/browser/time_zone_monitor.cc.orig	2016-05-11 19:02:21 UTC
++++ content/browser/time_zone_monitor.cc
+@@ -29,7 +29,7 @@ void TimeZoneMonitor::NotifyRenderers() 
+   scoped_ptr<icu::TimeZone> new_zone(icu::TimeZone::createDefault());
+ #else
+   icu::TimeZone* new_zone = icu::TimeZone::detectHostTimeZone();
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // We get here multiple times on Linux per a single tz change, but
+   // want to update the ICU default zone and notify renderer only once.
+   scoped_ptr<icu::TimeZone> current_zone(icu::TimeZone::createDefault());
diff --git a/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc b/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc
new file mode 100644
index 000000000000..6d05341da7b6
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_time__zone__monitor__linux.cc
@@ -0,0 +1,22 @@
+--- content/browser/time_zone_monitor_linux.cc.orig	2016-05-11 19:02:21 UTC
++++ content/browser/time_zone_monitor_linux.cc
+@@ -53,6 +53,9 @@ class TimeZoneMonitorLinuxImpl
+       : base::RefCountedThreadSafe<TimeZoneMonitorLinuxImpl>(),
+         file_path_watchers_(),
+         owner_(owner) {
++  }
++
++  void StartWatching() {
+     DCHECK_CURRENTLY_ON(BrowserThread::UI);
+     BrowserThread::PostTask(
+         BrowserThread::FILE,
+@@ -149,6 +152,9 @@ TimeZoneMonitorLinux::TimeZoneMonitorLin
+   // changed.
+   if (!getenv("TZ")) {
+     impl_ = new TimeZoneMonitorLinuxImpl(this);
++    if (impl_.get()) {
++      impl_->StartWatching();
++    }
+   }
+ }
+ 
diff --git a/www/chromium/files/patch-content_browser_utility__process__host__impl.cc b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
new file mode 100644
index 000000000000..b1e9f23de73c
--- /dev/null
+++ b/www/chromium/files/patch-content_browser_utility__process__host__impl.cc
@@ -0,0 +1,56 @@
+--- content/browser/utility_process_host_impl.cc.orig	2016-05-11 19:02:21 UTC
++++ content/browser/utility_process_host_impl.cc
+@@ -37,7 +37,7 @@
+ #include "ipc/ipc_switches.h"
+ #include "ui/base/ui_base_switches.h"
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ #include "content/public/browser/zygote_handle_linux.h"
+ #endif  // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
+ 
+@@ -48,7 +48,7 @@
+ 
+ namespace content {
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ namespace {
+ ZygoteHandle g_utility_zygote;
+ }  // namespace
+@@ -68,7 +68,7 @@ class UtilitySandboxedProcessLauncherDel
+         launch_elevated_(launch_elevated)
+ #elif defined(OS_POSIX)
+         env_(env),
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+         no_sandbox_(no_sandbox),
+ #endif  // !defined(OS_MACOSX)  && !defined(OS_ANDROID)
+         ipc_fd_(host->TakeClientFileDescriptor())
+@@ -100,7 +100,7 @@ class UtilitySandboxedProcessLauncherDel
+ 
+ #elif defined(OS_POSIX)
+ 
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   ZygoteHandle* GetZygote() override {
+     if (no_sandbox_ || !exposed_dir_.empty())
+       return nullptr;
+@@ -122,7 +122,7 @@ class UtilitySandboxedProcessLauncherDel
+   bool launch_elevated_;
+ #elif defined(OS_POSIX)
+   base::EnvironmentMap env_;
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD)
+   bool no_sandbox_;
+ #endif  // !defined(OS_MACOSX) && !defined(OS_ANDROID)
+   base::ScopedFD ipc_fd_;
+@@ -238,7 +238,7 @@ void UtilityProcessHostImpl::SetName(con
+   name_ = name;
+ }
+ 
+-#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
++#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_BSD)
+ // static
+ void UtilityProcessHostImpl::EarlyZygoteLaunch() {
+   DCHECK(!g_utility_zygote);
diff --git a/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc b/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
new file mode 100644
index 000000000000..c9de08759266
--- /dev/null
+++ b/www/chromium/files/patch-content_common_sandbox__linux_sandbox__debug__handling__linux.cc
@@ -0,0 +1,29 @@
+--- content/common/sandbox_linux/sandbox_debug_handling_linux.cc.orig	2016-03-25 13:04:48 UTC
++++ content/common/sandbox_linux/sandbox_debug_handling_linux.cc
+@@ -7,7 +7,9 @@
+ #include <errno.h>
+ #include <signal.h>
+ #include <stddef.h>
++#if 0 // no OS_FREEBSD here?
+ #include <sys/prctl.h>
++#endif
+ #include <unistd.h>
+ 
+ #include "base/command_line.h"
+@@ -69,12 +71,16 @@ bool SandboxDebugHandling::SetDumpableSt
+     return true;
+   }
+ 
++#if 0 // no OS_FREEBSD here?
+   if (prctl(PR_SET_DUMPABLE, 0) != 0) {
+     PLOG(ERROR) << "Failed to set non-dumpable flag";
+     return false;
+   }
+ 
+   return prctl(PR_GET_DUMPABLE) == 0;
++#else
++  return false;
++#endif
+ }
+ 
+ }  // namespace content
diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.cc b/www/chromium/files/patch-content_common_set__process__title__linux.cc
new file mode 100644
index 000000000000..f9839285a1e3
--- /dev/null
+++ b/www/chromium/files/patch-content_common_set__process__title__linux.cc
@@ -0,0 +1,19 @@
+--- content/common/set_process_title_linux.cc.orig	2016-03-25 13:04:48 UTC
++++ content/common/set_process_title_linux.cc
+@@ -49,6 +49,8 @@
+ extern char** environ;
+ 
+ static char** g_main_argv = NULL;
++
++#if !defined(OS_FREEBSD)
+ static char* g_orig_argv0 = NULL;
+ 
+ void setproctitle(const char* fmt, ...) {
+@@ -101,6 +103,7 @@ void setproctitle(const char* fmt, ...) 
+   va_end(ap);
+   g_main_argv[1] = NULL;
+ }
++#endif
+ 
+ // A version of this built into glibc would not need this function, since
+ // it could stash the argv pointer in __libc_start_main(). But we need it.
diff --git a/www/chromium/files/patch-content_common_set__process__title__linux.h b/www/chromium/files/patch-content_common_set__process__title__linux.h
new file mode 100644
index 000000000000..d0e2de386688
--- /dev/null
+++ b/www/chromium/files/patch-content_common_set__process__title__linux.h
@@ -0,0 +1,20 @@
+--- content/common/set_process_title_linux.h.orig	2016-03-25 13:04:48 UTC
++++ content/common/set_process_title_linux.h
+@@ -5,6 +5,9 @@
+ #ifndef CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
+ #define CONTENT_COMMON_SET_PROCESS_TITLE_LINUX_H_
+ 
++#include "build/build_config.h"
++
++#if !defined(OS_FREEBSD)
+ // Set the process title that will show in "ps" and similar tools. Takes
+ // printf-style format string and arguments. After calling setproctitle()
+ // the original main() argv[] array should not be used. By default, the
+@@ -14,6 +17,7 @@
+ // This signature and naming is to be compatible with most other Unix
+ // implementations of setproctitle().
+ void setproctitle(const char* fmt, ...);
++#endif
+ 
+ // Initialize state needed for setproctitle() on Linux. Pass the argv pointer
+ // from main() to setproctitle_init() before calling setproctitle().
diff --git a/www/chromium/files/patch-content_content__browser.gypi b/www/chromium/files/patch-content_content__browser.gypi
new file mode 100644
index 000000000000..e0c694c2d71b
--- /dev/null
+++ b/www/chromium/files/patch-content_content__browser.gypi
@@ -0,0 +1,77 @@
+--- content/content_browser.gypi.orig	2016-05-11 19:02:21 UTC
++++ content/content_browser.gypi
+@@ -843,6 +843,8 @@
+       'browser/geolocation/wifi_data_provider_common_win.cc',
+       'browser/geolocation/wifi_data_provider_common_win.h',
+       'browser/geolocation/wifi_data_provider_corewlan_mac.mm',
++      'browser/geolocation/wifi_data_provider_freebsd.cc',
++      'browser/geolocation/wifi_data_provider_freebsd.h',
+       'browser/geolocation/wifi_data_provider_linux.cc',
+       'browser/geolocation/wifi_data_provider_linux.h',
+       'browser/geolocation/wifi_data_provider_mac.cc',
+@@ -1988,7 +1990,7 @@
+         },
+       },
+     }],
+-    ['OS=="linux" and chromeos==0 and use_x11==1', {
++    ['(os_bsd==1 or OS=="linux") and chromeos==0 and use_x11==1', {
+       'dependencies': [
+         '../build/linux/system.gyp:atk',
+         '../build/linux/system.gyp:gconf',
+@@ -2014,7 +2016,7 @@
+         'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
+       ],
+     }],
+-    ['OS=="linux" and use_aura==1', {
++    ['(os_bsd==1 or OS=="linux") and use_aura==1', {
+       'dependencies': [
+         '../build/linux/system.gyp:fontconfig',
+       ],
+@@ -2109,8 +2111,24 @@
+       ],
+     }],
+     ['os_bsd==1', {
+-      'sources/': [
+-        ['exclude', '^browser/gamepad/gamepad_platform_data_fetcher_linux\\.cc$'],
++      'sources!': [
++        'public/browser/zygote_host_linux.h',
++        'browser/zygote_host/zygote_communication_linux.cc',
++        'browser/zygote_host/zygote_communication_linux.h',
++        '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',
++        'browser/device_monitor_linux.cc',
++        'browser/download/file_metadata_linux.cc',
++        'browser/gamepad/gamepad_platform_data_fetcher_linux.cc',
++        'browser/geolocation/wifi_data_provider_linux.cc',
++        'browser/udev_linux.cc',
++      ],
++      'dependencies': [
++        '../build/linux/system.gyp:dbus',
+       ],
+     }],
+     ['use_aura==1', {
+@@ -2159,10 +2177,7 @@
+         'browser/geolocation/empty_wifi_data_provider.cc',
+       ],
+     }],
+-    ['OS == "linux" and use_dbus==1', {
+-      'sources!': [
+-        'browser/geolocation/empty_wifi_data_provider.cc',
+-      ],
++    ['(OS == "linux" or os_bsd==1) and use_dbus==1', {
+       'dependencies': [
+         '../build/linux/system.gyp:dbus',
+         '../dbus/dbus.gyp:dbus',
+@@ -2178,7 +2193,7 @@
+         'browser/media/cdm/browser_cdm_manager.h',
+       ],
+     }],
+-    ['OS == "linux"', {
++    ['(os_bsd==1 or OS == "linux")', {
+       'dependencies': [
+         '../third_party/boringssl/boringssl.gyp:boringssl',
+       ],
diff --git a/www/chromium/files/patch-content_content__common.gypi b/www/chromium/files/patch-content_content__common.gypi
new file mode 100644
index 000000000000..1d2f69bde4e5
--- /dev/null
+++ b/www/chromium/files/patch-content_content__common.gypi
@@ -0,0 +1,24 @@
+--- content/content_common.gypi.orig	2016-05-11 19:02:21 UTC
++++ content/content_common.gypi
+@@ -737,6 +737,21 @@
+         'content.gyp:common_aidl',
+       ],
+     }],
++    ['os_bsd==1', {
++      'sources!': [
++        'common/sandbox_linux.cc',
++        'common/sandbox_linux.h',
++        'common/sandbox_init_linux.cc',
++        'common/sandbox_seccomp_bpf_linux.cc',
++        'common/sandbox_seccomp_bpf_linux.h',
++        'common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc',
++        'common/sandbox_linux/bpf_gpu_policy_linux.cc',
++        'common/sandbox_linux/bpf_ppapi_policy_linux.cc',
++        'common/sandbox_linux/bpf_renderer_policy_linux.cc',
++        'common/sandbox_linux/sandbox_bpf_base_policy_linux.cc',
++        'common/sandbox_linux/sandbox_seccomp_bpf_linux.cc',
++      ],
++    }],
+     ['use_pango == 1', {
+       'dependencies': [
+         '../build/linux/system.gyp:pangocairo',
diff --git a/www/chromium/files/patch-content_content__tests.gypi b/www/chromium/files/patch-content_content__tests.gypi
new file mode 100644
index 000000000000..68960cfaf8ac
--- /dev/null
+++ b/www/chromium/files/patch-content_content__tests.gypi
@@ -0,0 +1,18 @@
+--- content/content_tests.gypi.orig	2016-05-25 15:01:01.000000000 -0400
++++ content/content_tests.gypi	2016-05-27 10:58:38.919413000 -0400
+@@ -1186,6 +1186,15 @@
+             'renderer/media/video_track_recorder_unittest.cc',
+           ],
+         }],
++        ['OS == "freebsd"', {
++          'sources!': [
++            'browser/download/file_metadata_unittest_linux.cc',
++            'browser/geolocation/wifi_data_provider_linux_unittest.cc',
++            'browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc',
++            'browser/renderer_host/media/media_stream_manager_unittest.cc',
++            'browser/renderer_host/media/media_stream_ui_controller_unittest.cc'
++          ]
++        }], 
+         # Avoid windows due to non-availability of cursor resources in test.
+         ['OS != "linux"', {
+           'sources!': [
diff --git a/www/chromium/files/patch-content_gpu_gpu__child__thread.cc b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc
new file mode 100644
index 000000000000..e7d1b0b616ac
--- /dev/null
+++ b/www/chromium/files/patch-content_gpu_gpu__child__thread.cc
@@ -0,0 +1,18 @@
+--- content/gpu/gpu_child_thread.cc.orig	2016-05-11 19:02:21 UTC
++++ content/gpu/gpu_child_thread.cc
+@@ -382,6 +382,7 @@ void GpuChildThread::StopWatchdog() {
+ }
+ 
+ void GpuChildThread::OnCollectGraphicsInfo() {
++#if !defined(OS_FREEBSD)
+ #if defined(OS_WIN)
+   // GPU full info collection should only happen on un-sandboxed GPU process
+   // or single process/in-process gpu mode on Windows.
+@@ -424,6 +425,7 @@ void GpuChildThread::OnCollectGraphicsIn
+     base::MessageLoop::current()->QuitWhenIdle();
+   }
+ #endif  // OS_WIN
++#endif  // XXX(rene) !FreeBSD
+ }
+ 
+ void GpuChildThread::OnGetVideoMemoryUsageStats() {
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
new file mode 100644
index 000000000000..daff262b902d
--- /dev/null
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -0,0 +1,45 @@
+--- content/gpu/gpu_main.cc.orig	2016-05-11 19:02:21 UTC
++++ content/gpu/gpu_main.cc
+@@ -99,7 +99,7 @@ void GetGpuInfoFromCommandLine(gpu::GPUI
+                                const base::CommandLine& command_line);
+ bool WarmUpSandbox(const base::CommandLine& command_line);
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
+ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info);
+ #endif
+ 
+@@ -187,13 +187,13 @@ int GpuMain(const MainFunctionParams& pa
+   // Use a UI message loop because ANGLE and the desktop GL platform can
+   // create child windows to render to.
+   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
+-#elif defined(OS_LINUX) && defined(USE_X11)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11)
+   // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX
+   // and https://crbug.com/326995.
+   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI);
+   scoped_ptr<ui::PlatformEventSource> event_source =
+       ui::PlatformEventSource::CreateDefault();
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT);
+ #elif defined(OS_MACOSX)
+   // This is necessary for CoreAnimation layers hosted in the GPU process to be
+@@ -304,7 +304,7 @@ int GpuMain(const MainFunctionParams& pa
+       // and we already registered them through SetGpuInfo() above.
+       base::TimeTicks before_collect_context_graphics_info =
+           base::TimeTicks::Now();
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD) //XXX(rene) added !FreeBSD
+       if (!CollectGraphicsInfo(gpu_info))
+         dead_on_arrival = true;
+ 
+@@ -467,7 +467,7 @@ bool WarmUpSandbox(const base::CommandLi
+   return true;
+ }
+ 
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_FREEBSD)//XXX(rene) added !FreeBSD
+ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info) {
+   TRACE_EVENT0("gpu,startup", "Collect Graphics Info");
+ 
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
new file mode 100644
index 000000000000..90f349395319
--- /dev/null
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -0,0 +1,11 @@
+--- content/public/common/content_switches.cc.orig	2016-05-11 19:02:21 UTC
++++ content/public/common/content_switches.cc
+@@ -978,7 +978,7 @@ const char kDisableVaapiAcceleratedVideo
+     "disable-vaapi-accelerated-video-encode";
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ // Allows sending text-to-speech requests to speech-dispatcher, a common
+ // Linux speech service. Because it's buggy, the user must explicitly
+ // enable it so that visiting a random webpage can't cause instability.
diff --git a/www/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
new file mode 100644
index 000000000000..df8933767fbd
--- /dev/null
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -0,0 +1,11 @@
+--- content/public/common/content_switches.h.orig	2016-05-11 19:02:21 UTC
++++ content/public/common/content_switches.h
+@@ -284,7 +284,7 @@ CONTENT_EXPORT extern const char kDisabl
+ CONTENT_EXPORT extern const char kDisableVaapiAcceleratedVideoEncode[];
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
+ #endif
+ 
diff --git a/www/chromium/files/patch-content_public_test_browser__test__base.cc b/www/chromium/files/patch-content_public_test_browser__test__base.cc
new file mode 100644
index 000000000000..43aa3aaf1845
--- /dev/null
+++ b/www/chromium/files/patch-content_public_test_browser__test__base.cc
@@ -0,0 +1,13 @@
+--- content/public/test/browser_test_base.cc.orig	2016-05-11 19:02:21 UTC
++++ content/public/test/browser_test_base.cc
+@@ -6,6 +6,10 @@
+ 
+ #include <stddef.h>
+ 
++#if defined(OS_FREEBSD)
++#include <sys/signal.h>
++#endif
++
+ #include "base/bind.h"
+ #include "base/command_line.h"
+ #include "base/debug/stack_trace.h"
diff --git a/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc b/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc
new file mode 100644
index 000000000000..7c90141b376e
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_devtools_v8__sampling__profiler.cc
@@ -0,0 +1,13 @@
+--- content/renderer/devtools/v8_sampling_profiler.cc.orig	2016-05-11 19:02:21 UTC
++++ content/renderer/devtools/v8_sampling_profiler.cc
+@@ -544,6 +544,10 @@ void V8SamplingThread::HandleProfilerSig
+   state.pc = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rip, __eip));
+   state.sp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rsp, __esp));
+   state.fp = reinterpret_cast<void*>(mcontext->__ss.REG_64_32(__rbp, __ebp));
++#elif defined(OS_FREEBSD)
++  state.pc = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rip, mc_eip));
++  state.sp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rsp, mc_esp));
++  state.fp = reinterpret_cast<void*>(mcontext.REG_64_32(mc_rbp, mc_ebp));
+ #else
+   state.pc =
+       reinterpret_cast<void*>(mcontext.gregs[REG_64_32(REG_RIP, REG_EIP)]);
diff --git a/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc b/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc
new file mode 100644
index 000000000000..d7f49d4029e0
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_media_webrtc__audio__capturer.cc
@@ -0,0 +1,13 @@
+--- content/renderer/media/webrtc_audio_capturer.cc.orig	2016-05-11 19:02:21 UTC
++++ content/renderer/media/webrtc_audio_capturer.cc
+@@ -476,8 +476,8 @@ void WebRtcAudioCapturer::Capture(const 
+ // CaptureCallback.
+ #if defined(OS_WIN) || defined(OS_MACOSX)
+   DCHECK_LE(volume, 1.0);
+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_OPENBSD)
+-  // We have a special situation on Linux where the microphone volume can be
++#elif defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_ANDROID)
++  // We have a special situation on POSIX where the microphone volume can be
+   // "higher than maximum". The input volume slider in the sound preference
+   // allows the user to set a scaling that is higher than 100%. It means that
+   // even if the reported maximum levels is N, the actual microphone level can
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
new file mode 100644
index 000000000000..f45119472e31
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -0,0 +1,11 @@
+--- content/renderer/render_thread_impl.cc.orig	2016-05-25 15:01:02.000000000 -0400
++++ content/renderer/render_thread_impl.cc	2016-05-27 11:01:14.634236000 -0400
+@@ -1468,7 +1468,7 @@
+     const bool enable_video_accelerator =
+         !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode);
+     const bool enable_gpu_memory_buffer_video_frames =
+-#if defined(OS_MACOSX) || defined(OS_LINUX)
++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD)
+         !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames) &&
+         !cmd_line->HasSwitch(switches::kDisableGpuCompositing) &&
+         !gpu_channel_host->gpu_info().software_rendering;
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
new file mode 100644
index 000000000000..3891bb30c241
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -0,0 +1,56 @@
+--- content/renderer/renderer_blink_platform_impl.cc.orig	2016-05-27 22:47:40.255637000 -0400
++++ content/renderer/renderer_blink_platform_impl.cc	2016-05-28 10:09:25.718992000 -0400
+@@ -116,7 +116,7 @@
+ 
+ #if defined(OS_POSIX)
+ #include "base/file_descriptor_posix.h"
+-#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
++#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+ #include <map>
+ #include <string>
+ 
+@@ -207,7 +207,7 @@
+   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
+ };
+ 
+-#if !defined(OS_ANDROID) && !defined(OS_WIN)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
+ class RendererBlinkPlatformImpl::SandboxSupport
+     : public blink::WebSandboxSupport {
+  public:
+@@ -253,7 +253,7 @@
+       web_scrollbar_behavior_(new WebScrollbarBehaviorImpl),
+       renderer_scheduler_(renderer_scheduler),
+       blink_service_registry_(new BlinkServiceRegistryImpl(service_registry)) {
+-#if !defined(OS_ANDROID) && !defined(OS_WIN)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
+   if (g_sandbox_enabled && sandboxEnabled()) {
+     sandbox_support_.reset(new RendererBlinkPlatformImpl::SandboxSupport);
+   } else {
+@@ -284,7 +284,7 @@
+ }
+ 
+ void RendererBlinkPlatformImpl::Shutdown() {
+-#if !defined(OS_ANDROID) && !defined(OS_WIN)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_FREEBSD)
+   // SandboxSupport contains a map of WebFontFamily objects, which hold
+   // WebCStrings, which become invalidated when blink is shut down. Hence, we
+   // need to clear that map now, just before blink::shutdown() is called.
+@@ -334,7 +334,7 @@
+ }
+ 
+ blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() {
+-#if defined(OS_ANDROID) || defined(OS_WIN)
++#if defined(OS_ANDROID) || defined(OS_WIN) || defined(OS_FREEBSD)
+   // These platforms do not require sandbox support.
+   return NULL;
+ #else
+@@ -562,7 +562,7 @@
+   return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out);
+ }
+ 
+-#elif defined(OS_POSIX) && !defined(OS_ANDROID)
++#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+ 
+ void RendererBlinkPlatformImpl::SandboxSupport::getFallbackFontForCharacter(
+     blink::WebUChar32 character,
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
new file mode 100644
index 000000000000..549567adc6cd
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -0,0 +1,11 @@
+--- content/renderer/renderer_blink_platform_impl.h.orig	2016-05-11 19:02:22 UTC
++++ content/renderer/renderer_blink_platform_impl.h
+@@ -250,7 +250,7 @@ class CONTENT_EXPORT RendererBlinkPlatfo
+   class MimeRegistry;
+   scoped_ptr<MimeRegistry> mime_registry_;
+ 
+-#if !defined(OS_ANDROID) && !defined(OS_WIN)
++#if !defined(OS_ANDROID) && !defined(OS_WIN) && !defined(OS_BSD)
+   class SandboxSupport;
+   scoped_ptr<SandboxSupport> sandbox_support_;
+ #endif
diff --git a/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
new file mode 100644
index 000000000000..e8924809f260
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_renderer__main__platform__delegate__linux.cc
@@ -0,0 +1,19 @@
+--- content/renderer/renderer_main_platform_delegate_linux.cc.orig	2016-04-08 16:02:09 UTC
++++ content/renderer/renderer_main_platform_delegate_linux.cc
+@@ -29,6 +29,7 @@ void RendererMainPlatformDelegate::Platf
+ }
+ 
+ bool RendererMainPlatformDelegate::EnableSandbox() {
++#if !defined(OS_BSD)
+   // The setuid sandbox is started in the zygote process: zygote_main_linux.cc
+   // https://chromium.googlesource.com/chromium/src/+/master/docs/linux_suid_sandbox.md
+   //
+@@ -59,7 +60,7 @@ bool RendererMainPlatformDelegate::Enabl
+     CHECK_EQ(errno, EPERM);
+   }
+ #endif  // __x86_64__
+-
++#endif  // ! OS_BSD
+   return true;
+ }
+ 
diff --git a/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc
new file mode 100644
index 000000000000..d85e56786d1c
--- /dev/null
+++ b/www/chromium/files/patch-content_renderer_webscrollbarbehavior__impl__gtkoraura.cc
@@ -0,0 +1,20 @@
+--- content/renderer/webscrollbarbehavior_impl_gtkoraura.cc.orig	2016-03-25 13:04:49 UTC
++++ content/renderer/webscrollbarbehavior_impl_gtkoraura.cc
+@@ -14,7 +14,7 @@ bool WebScrollbarBehaviorImpl::shouldCen
+       blink::WebScrollbarBehavior::Button mouseButton,
+       bool shiftKeyPressed,
+       bool altKeyPressed) {
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   if (mouseButton == blink::WebScrollbarBehavior::ButtonMiddle)
+     return true;
+ #endif
+@@ -50,7 +50,7 @@ bool WebScrollbarBehaviorImpl::shouldSna
+   // On most platforms, we should snap iff the event is outside our calculated
+   // rect.  On Linux, however, we should not snap for events off the ends, but
+   // not the sides, of the rect.
+-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   return isHorizontal ?
+       (eventPoint.y < noSnapRect.y() || eventPoint.y >= noSnapRect.bottom()) :
+       (eventPoint.x < noSnapRect.x() || eventPoint.x >= noSnapRect.right());
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
new file mode 100644
index 000000000000..22d7a5811247
--- /dev/null
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__context.cc
@@ -0,0 +1,20 @@
+--- content/shell/browser/shell_browser_context.cc.orig	2016-05-11 19:02:22 UTC
++++ content/shell/browser/shell_browser_context.cc
+@@ -24,7 +24,7 @@
+ 
+ #if defined(OS_WIN)
+ #include "base/base_paths_win.h"
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #include "base/nix/xdg_util.h"
+ #elif defined(OS_MACOSX)
+ #include "base/base_paths_mac.h"
+@@ -79,7 +79,7 @@ void ShellBrowserContext::InitWhileIOAll
+ #if defined(OS_WIN)
+   CHECK(PathService::Get(base::DIR_LOCAL_APP_DATA, &path_));
+   path_ = path_.Append(std::wstring(L"content_shell"));
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   scoped_ptr<base::Environment> env(base::Environment::Create());
+   base::FilePath config_dir(
+       base::nix::GetXDGDirectory(env.get(),
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
new file mode 100644
index 000000000000..838120c8f8a1
--- /dev/null
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -0,0 +1,20 @@
+--- content/shell/browser/shell_browser_main_parts.cc.orig	2016-05-11 19:02:22 UTC
++++ content/shell/browser/shell_browser_main_parts.cc
+@@ -40,7 +40,7 @@
+ #if defined(USE_AURA) && defined(USE_X11)
+ #include "ui/events/devices/x11/touch_factory_x11.h"
+ #endif
+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
+ #include "ui/base/ime/input_method_initializer.h"
+ #endif
+ #if defined(OS_CHROMEOS)
+@@ -124,7 +124,7 @@ void ShellBrowserMainParts::PostMainMess
+ }
+ 
+ void ShellBrowserMainParts::PreEarlyInitialization() {
+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX))
+   ui::InitializeInputMethodForTesting();
+ #endif
+ #if defined(OS_ANDROID)
diff --git a/www/chromium/files/patch-crypto__nss_util.cc b/www/chromium/files/patch-crypto__nss_util.cc
deleted file mode 100644
index f0b2cf54c752..000000000000
--- a/www/chromium/files/patch-crypto__nss_util.cc
+++ /dev/null
@@ -1,33 +0,0 @@
---- crypto/nss_util.cc.orig	2015-07-15 16:30:04.000000000 -0400
-+++ crypto/nss_util.cc	2015-07-22 07:15:16.577810000 -0400
-@@ -13,7 +13,7 @@
- #include <prtime.h>
- #include <secmod.h>
- 
--#if defined(OS_OPENBSD)
-+#if defined(OS_BSD)
- #include <sys/mount.h>
- #include <sys/param.h>
- #endif
-@@ -146,7 +146,7 @@
- // detection when database_dir is on NFS.  See http://crbug.com/48585.
- //
- // TODO(wtc): port this function to other USE_NSS_CERTS platforms.  It is
--// defined only for OS_LINUX and OS_OPENBSD simply because the statfs structure
-+// defined only for OS_LINUX and OS_BSD simply because the statfs structure
- // is OS-specific.
- //
- // Because this function sets an environment variable it must be run before we
-@@ -157,10 +157,10 @@
-   base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
-   if (base::GetFileSystemType(database_dir, &fs_type))
-     db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
--#elif defined(OS_OPENBSD)
-+#elif defined(OS_BSD)
-   struct statfs buf;
-   if (statfs(database_dir.value().c_str(), &buf) == 0)
--    db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0);
-+    db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0);
- #else
-   NOTIMPLEMENTED();
- #endif
diff --git a/www/chromium/files/patch-crypto_nss__util.cc b/www/chromium/files/patch-crypto_nss__util.cc
new file mode 100644
index 000000000000..959c18c16d41
--- /dev/null
+++ b/www/chromium/files/patch-crypto_nss__util.cc
@@ -0,0 +1,33 @@
+--- crypto/nss_util.cc.orig	2016-05-11 19:02:22 UTC
++++ crypto/nss_util.cc
+@@ -15,7 +15,7 @@
+ 
+ #include "crypto/nss_util_internal.h"
+ 
+-#if defined(OS_OPENBSD)
++#if defined(OS_BSD)
+ #include <sys/mount.h>
+ #include <sys/param.h>
+ #endif
+@@ -147,7 +147,7 @@ char* PKCS11PasswordFunc(PK11SlotInfo* s
+ // detection when database_dir is on NFS.  See http://crbug.com/48585.
+ //
+ // TODO(wtc): port this function to other USE_NSS_CERTS platforms.  It is
+-// defined only for OS_LINUX and OS_OPENBSD simply because the statfs structure
++// defined only for OS_LINUX and OS_BSD simply because the statfs structure
+ // is OS-specific.
+ //
+ // Because this function sets an environment variable it must be run before we
+@@ -158,10 +158,10 @@ void UseLocalCacheOfNSSDatabaseIfNFS(con
+   base::FileSystemType fs_type = base::FILE_SYSTEM_UNKNOWN;
+   if (base::GetFileSystemType(database_dir, &fs_type))
+     db_on_nfs = (fs_type == base::FILE_SYSTEM_NFS);
+-#elif defined(OS_OPENBSD)
++#elif defined(OS_BSD)
+   struct statfs buf;
+   if (statfs(database_dir.value().c_str(), &buf) == 0)
+-    db_on_nfs = (strcmp(buf.f_fstypename, MOUNT_NFS) == 0);
++    db_on_nfs = (strcmp(buf.f_fstypename, "nfs") == 0);
+ #else
+   NOTIMPLEMENTED();
+ #endif
diff --git a/www/chromium/files/patch-device__hid__hid.gyp b/www/chromium/files/patch-device__hid__hid.gyp
deleted file mode 100644
index f3444038cd6f..000000000000
--- a/www/chromium/files/patch-device__hid__hid.gyp
+++ /dev/null
@@ -1,21 +0,0 @@
---- device/hid/hid.gyp.orig	2014-10-10 08:54:15 UTC
-+++ device/hid/hid.gyp
-@@ -63,6 +63,18 @@
-             'input_service_linux.h',
-           ],
-         }],
-+        ['os_bsd==1', {
-+          'sources!': [
-+            'device_monitor_linux.cc',
-+            'device_monitor_linux.h',
-+            'hid_connection_linux.cc',
-+            'hid_connection_linux.h',
-+            'hid_service_linux.cc',
-+            'hid_service_linux.h',
-+            'input_service_linux.cc',
-+            'input_service_linux.h',
-+          ],
-+        }],
-       ],
-     },
-   ],
diff --git a/www/chromium/files/patch-device__serial__serial.gyp b/www/chromium/files/patch-device__serial__serial.gyp
deleted file mode 100644
index f88115cac52c..000000000000
--- a/www/chromium/files/patch-device__serial__serial.gyp
+++ /dev/null
@@ -1,15 +0,0 @@
---- device/serial/serial.gyp.orig	2014-10-10 09:15:31 UTC
-+++ device/serial/serial.gyp
-@@ -38,6 +38,12 @@
-             'serial_device_enumerator_linux.h',
-           ],
-         }],
-+        ['os_bsd==1', {
-+          'sources!': [
-+            'serial_device_enumerator_linux.cc',
-+            'serial_device_enumerator_linux.h',
-+          ],
-+        }],
-       ],
-       'dependencies': [
-         'device_serial_mojo',
diff --git a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc b/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
deleted file mode 100644
index f5ff28038f94..000000000000
--- a/www/chromium/files/patch-device__serial__serial_io_handler_posix.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- device/serial/serial_io_handler_posix.cc.orig	2015-10-14 16:49:00.395597000 +0200
-+++ device/serial/serial_io_handler_posix.cc	2015-10-14 17:18:20.515698000 +0200
-@@ -59,7 +59,7 @@
-     BITRATE_TO_SPEED_CASE(9600)
-     BITRATE_TO_SPEED_CASE(19200)
-     BITRATE_TO_SPEED_CASE(38400)
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
-     BITRATE_TO_SPEED_CASE(57600)
-     BITRATE_TO_SPEED_CASE(115200)
-     BITRATE_TO_SPEED_CASE(230400)
diff --git a/www/chromium/files/patch-device__serial__serial_service_impl.cc b/www/chromium/files/patch-device__serial__serial_service_impl.cc
deleted file mode 100644
index 371c04f21e81..000000000000
--- a/www/chromium/files/patch-device__serial__serial_service_impl.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- device/serial/serial_service_impl.cc.orig	2015-01-21 20:05:43 UTC
-+++ device/serial/serial_service_impl.cc
-@@ -72,9 +72,14 @@
- }
- 
- SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {
-+#if defined(OS_BSD)
-+  NOTIMPLEMENTED();
-+  return NULL;
-+#else
-   if (!device_enumerator_)
-     device_enumerator_ = SerialDeviceEnumerator::Create();
-   return device_enumerator_.get();
-+#endif
- }
- 
- bool SerialServiceImpl::IsValidPath(const mojo::String& path) {
diff --git a/www/chromium/files/patch-device__usb__usb.gyp b/www/chromium/files/patch-device__usb__usb.gyp
deleted file mode 100644
index d72e1ccc3111..000000000000
--- a/www/chromium/files/patch-device__usb__usb.gyp
+++ /dev/null
@@ -1,14 +0,0 @@
---- device/usb/usb.gyp.orig	2014-10-10 08:54:15 UTC
-+++ device/usb/usb.gyp
-@@ -65,6 +65,11 @@
-             '../../build/linux/system.gyp:udev',
-           ],
-         }],
-+        ['OS == "freebsd"', {
-+          'dependencies!': [
-+            '../../third_party/libusb/libusb.gyp:libusb',
-+          ],
-+        }],
-         ['chromeos==1', {
-           'dependencies': [
-             '../../chromeos/chromeos.gyp:chromeos',
diff --git a/www/chromium/files/patch-device__usb__usb_context.cc b/www/chromium/files/patch-device__usb__usb_context.cc
deleted file mode 100644
index c67dea0afc12..000000000000
--- a/www/chromium/files/patch-device__usb__usb_context.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- device/usb/usb_context.cc.orig	2015-07-15 16:30:04.000000000 -0400
-+++ device/usb/usb_context.cc	2015-07-22 07:32:40.938868000 -0400
-@@ -8,8 +8,13 @@
- #include "base/logging.h"
- #include "base/threading/platform_thread.h"
- #include "device/usb/usb_error.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/interrupt.h"
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
-@@ -62,7 +67,9 @@
- 
- void UsbContext::UsbEventHandler::Stop() {
-   base::subtle::Release_Store(&running_, 0);
-+#if !defined(OS_FREEBSD) // XXX(rene) not available in base version
-   libusb_interrupt_handle_event(context_);
-+#endif
- }
- 
- UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {
diff --git a/www/chromium/files/patch-device__usb__usb_context_unittest.cc b/www/chromium/files/patch-device__usb__usb_context_unittest.cc
deleted file mode 100644
index 45ceb2e19eda..000000000000
--- a/www/chromium/files/patch-device__usb__usb_context_unittest.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- device/usb/usb_context_unittest.cc.orig	2014-10-10 08:54:15 UTC
-+++ device/usb/usb_context_unittest.cc
-@@ -6,7 +6,11 @@
- #include "build/build_config.h"
- #include "device/usb/usb_context.h"
- #include "testing/gtest/include/gtest/gtest.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
diff --git a/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc b/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc
deleted file mode 100644
index 42fe658e07d4..000000000000
--- a/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- device/usb/usb_device_handle_impl.cc.orig	2014-10-10 08:54:15 UTC
-+++ device/usb/usb_device_handle_impl.cc
-@@ -19,7 +19,12 @@
- #include "device/usb/usb_device_impl.h"
- #include "device/usb/usb_error.h"
- #include "device/usb/usb_service.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
diff --git a/www/chromium/files/patch-device__usb__usb_device_handle_impl.h b/www/chromium/files/patch-device__usb__usb_device_handle_impl.h
deleted file mode 100644
index a07b5e6b9998..000000000000
--- a/www/chromium/files/patch-device__usb__usb_device_handle_impl.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- device/usb/usb_device_handle_impl.h.orig	2015-07-15 16:30:04.000000000 -0400
-+++ device/usb/usb_device_handle_impl.h	2015-07-22 07:35:03.384188000 -0400
-@@ -13,7 +13,12 @@
- #include "base/memory/ref_counted.h"
- #include "base/threading/thread_checker.h"
- #include "device/usb/usb_device_handle.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace base {
- class SequencedTaskRunner;
diff --git a/www/chromium/files/patch-device__usb__usb_device_impl.cc b/www/chromium/files/patch-device__usb__usb_device_impl.cc
deleted file mode 100644
index 0f5171afb2b7..000000000000
--- a/www/chromium/files/patch-device__usb__usb_device_impl.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- device/usb/usb_device_impl.cc.orig	2014-10-10 08:54:15 UTC
-+++ device/usb/usb_device_impl.cc
-@@ -17,7 +17,11 @@
- #include "device/usb/usb_descriptors.h"
- #include "device/usb/usb_device_handle_impl.h"
- #include "device/usb/usb_error.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- #if defined(OS_CHROMEOS)
- #include "base/sys_info.h"
diff --git a/www/chromium/files/patch-device__usb__usb_error.cc b/www/chromium/files/patch-device__usb__usb_error.cc
deleted file mode 100644
index 211925521b07..000000000000
--- a/www/chromium/files/patch-device__usb__usb_error.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- device/usb/usb_error.cc.orig	2014-10-10 08:54:15 UTC
-+++ device/usb/usb_error.cc
-@@ -4,7 +4,11 @@
- 
- #include "device/usb/usb_error.h"
- 
-+#if defined(__FreeBSD__)
-+#include "libusb.h"
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- namespace device {
- 
diff --git a/www/chromium/files/patch-device__usb__usb_service_impl.cc b/www/chromium/files/patch-device__usb__usb_service_impl.cc
deleted file mode 100644
index 80b221282dfb..000000000000
--- a/www/chromium/files/patch-device__usb__usb_service_impl.cc
+++ /dev/null
@@ -1,59 +0,0 @@
---- device/usb/usb_service_impl.cc.orig	2015-12-04 22:33:43.708484000 +0100
-+++ device/usb/usb_service_impl.cc	2015-12-04 22:39:47.903086000 +0100
-@@ -20,7 +20,11 @@
- #include "device/usb/usb_device_handle.h"
- #include "device/usb/usb_error.h"
- #include "device/usb/webusb_descriptors.h"
-+#if defined(OS_FREEBSD)
-+#include <libusb.h>
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
- 
- #if defined(OS_WIN)
- #include <setupapi.h>
-@@ -541,6 +545,7 @@
-   }
-   context_ = new UsbContext(platform_context);
- 
-+#if !defined(OS_FREEBSD)
-   rv = libusb_hotplug_register_callback(
-       context_->context(),
-       static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
-@@ -553,6 +558,8 @@
-   }
- 
-   RefreshDevices();
-+#endif // !defined(OS_FREEBSD)
-+
- #if defined(OS_WIN)
-   DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
-   if (device_monitor) {
-@@ -562,9 +569,11 @@
- }
- 
- UsbServiceImpl::~UsbServiceImpl() {
-+#if !defined(OS_FREEBSD)
-   if (hotplug_enabled_) {
-     libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
-   }
-+#endif // !defined(OS_FREEBSD)
-   for (const auto& map_entry : devices_) {
-     map_entry.second->OnDisconnect();
-   }
-@@ -802,6 +811,7 @@
-   device->OnDisconnect();
- }
- 
-+#if !defined(OS_FREEBSD)
- // static
- int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
-                                                 PlatformUsbDevice device,
-@@ -839,6 +849,7 @@
- 
-   return 0;
- }
-+#endif // !defined(OS_FREEBSD)
- 
- void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
-   DCHECK(CalledOnValidThread());
diff --git a/www/chromium/files/patch-device__usb__usb_service_impl.h b/www/chromium/files/patch-device__usb__usb_service_impl.h
deleted file mode 100644
index f670cd82a0ac..000000000000
--- a/www/chromium/files/patch-device__usb__usb_service_impl.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- device/usb/usb_service_impl.h.orig	2015-07-15 16:30:04.000000000 -0400
-+++ device/usb/usb_service_impl.h	2015-07-22 07:42:23.863097000 -0400
-@@ -11,7 +11,13 @@
- #include "base/message_loop/message_loop.h"
- #include "device/usb/usb_context.h"
- #include "device/usb/usb_device_impl.h"
-+#if defined(OS_FREEBSD)
-+#include "libusb.h"
-+#define LIBUSB_CALL
-+#else
- #include "third_party/libusb/src/libusb/libusb.h"
-+#endif
-+
- 
- #if defined(OS_WIN)
- #include "base/scoped_observer.h"
-@@ -92,11 +98,13 @@
- 
-   void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
- 
-+#if !defined(OS_FREEBSD)
-   // Handle hotplug events from libusb.
-   static int LIBUSB_CALL HotplugCallback(libusb_context* context,
-                                          PlatformUsbDevice device,
-                                          libusb_hotplug_event event,
-                                          void* user_data);
-+#endif
-   // These functions release a reference to the provided platform device.
-   void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
-   void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
-@@ -112,7 +120,9 @@
-   // connected instead of only when a full enumeration is requested.
-   // TODO(reillyg): Support this on all platforms. crbug.com/411715
-   bool hotplug_enabled_ = false;
-+#if !defined(OS_FREEBSD)
-   libusb_hotplug_callback_handle hotplug_handle_;
-+#endif
- 
-   // Enumeration callbacks are queued until an enumeration completes.
-   bool enumeration_ready_ = false;
diff --git a/www/chromium/files/patch-device_hid_hid.gyp b/www/chromium/files/patch-device_hid_hid.gyp
new file mode 100644
index 000000000000..1a073aa9270e
--- /dev/null
+++ b/www/chromium/files/patch-device_hid_hid.gyp
@@ -0,0 +1,21 @@
+--- device/hid/hid.gyp.orig	2016-05-11 19:02:22 UTC
++++ device/hid/hid.gyp
+@@ -64,6 +64,18 @@
+             'input_service_linux.h',
+           ],
+         }],
++        ['os_bsd==1', {
++          'sources!': [
++            'device_monitor_linux.cc',
++            'device_monitor_linux.h',
++            'hid_connection_linux.cc',
++            'hid_connection_linux.h',
++            'hid_service_linux.cc',
++            'hid_service_linux.h',
++            'input_service_linux.cc',
++            'input_service_linux.h',
++          ],
++        }],
+       ],
+     },
+     {
diff --git a/www/chromium/files/patch-device_serial_serial.gyp b/www/chromium/files/patch-device_serial_serial.gyp
new file mode 100644
index 000000000000..74bbfd082396
--- /dev/null
+++ b/www/chromium/files/patch-device_serial_serial.gyp
@@ -0,0 +1,15 @@
+--- device/serial/serial.gyp.orig	2016-04-08 16:02:09 UTC
++++ device/serial/serial.gyp
+@@ -71,6 +71,12 @@
+             },
+           },
+         }],
++        ['os_bsd==1', {
++          'sources!': [
++            'serial_device_enumerator_linux.cc',
++            'serial_device_enumerator_linux.h',
++          ],
++        }],
+       ],
+       'dependencies': [
+         'device_serial_mojo',
diff --git a/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc
new file mode 100644
index 000000000000..3f56a6f06677
--- /dev/null
+++ b/www/chromium/files/patch-device_serial_serial__io__handler__posix.cc
@@ -0,0 +1,11 @@
+--- device/serial/serial_io_handler_posix.cc.orig	2016-04-08 16:02:09 UTC
++++ device/serial/serial_io_handler_posix.cc
+@@ -60,7 +60,7 @@ bool BitrateToSpeedConstant(int bitrate,
+     BITRATE_TO_SPEED_CASE(9600)
+     BITRATE_TO_SPEED_CASE(19200)
+     BITRATE_TO_SPEED_CASE(38400)
+-#if !defined(OS_MACOSX)
++#if !defined(OS_MACOSX) && !defined(OS_BSD)
+     BITRATE_TO_SPEED_CASE(57600)
+     BITRATE_TO_SPEED_CASE(115200)
+     BITRATE_TO_SPEED_CASE(230400)
diff --git a/www/chromium/files/patch-device_serial_serial__service__impl.cc b/www/chromium/files/patch-device_serial_serial__service__impl.cc
new file mode 100644
index 000000000000..13e2a9f7bf47
--- /dev/null
+++ b/www/chromium/files/patch-device_serial_serial__service__impl.cc
@@ -0,0 +1,17 @@
+--- device/serial/serial_service_impl.cc.orig	2016-05-11 19:02:22 UTC
++++ device/serial/serial_service_impl.cc
+@@ -74,9 +74,14 @@ void SerialServiceImpl::Connect(
+ }
+ 
+ SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {
++#if defined(OS_BSD)
++  NOTIMPLEMENTED();
++  return NULL;
++#else
+   if (!device_enumerator_)
+     device_enumerator_ = SerialDeviceEnumerator::Create();
+   return device_enumerator_.get();
++#endif
+ }
+ 
+ bool SerialServiceImpl::IsValidPath(const mojo::String& path) {
diff --git a/www/chromium/files/patch-device_usb_usb.gyp b/www/chromium/files/patch-device_usb_usb.gyp
new file mode 100644
index 000000000000..e540b4fd19a7
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb.gyp
@@ -0,0 +1,19 @@
+--- device/usb/usb.gyp.orig	2016-05-25 15:01:02.000000000 -0400
++++ device/usb/usb.gyp	2016-05-30 13:54:50.903083000 -0400
+@@ -117,6 +117,16 @@
+             'usb_service_impl.h',
+           ]
+         }],
++        ['OS == "freebsd"', {
++          'dependencies!': [
++            '../../third_party/libusb/libusb.gyp:libusb',
++          ],
++          'link_settings': {
++            'ldflags': [
++              '-L/usr/lib -lusb',
++            ],
++          },
++        }],
+         ['chromeos==1', {
+           'dependencies': [
+             '../../chromeos/chromeos.gyp:chromeos',
diff --git a/www/chromium/files/patch-device_usb_usb__context.cc b/www/chromium/files/patch-device_usb_usb__context.cc
new file mode 100644
index 000000000000..7cfd3c0c803e
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__context.cc
@@ -0,0 +1,26 @@
+--- device/usb/usb_context.cc.orig	2016-03-25 13:04:49 UTC
++++ device/usb/usb_context.cc
+@@ -9,8 +9,13 @@
+ #include "base/macros.h"
+ #include "base/threading/simple_thread.h"
+ #include "device/usb/usb_error.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#define LIBUSB_CALL
++#else
+ #include "third_party/libusb/src/libusb/interrupt.h"
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ namespace device {
+ 
+@@ -58,7 +63,9 @@ void UsbContext::UsbEventHandler::Run() 
+ 
+ void UsbContext::UsbEventHandler::Stop() {
+   base::subtle::Release_Store(&running_, 0);
++#if !defined(OS_FREEBSD) // XXX(rene) not available in base version
+   libusb_interrupt_handle_event(context_);
++#endif
+ }
+ 
+ UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {
diff --git a/www/chromium/files/patch-device_usb_usb__context__unittest.cc b/www/chromium/files/patch-device_usb_usb__context__unittest.cc
new file mode 100644
index 000000000000..ff224435eb85
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__context__unittest.cc
@@ -0,0 +1,14 @@
+--- device/usb/usb_context_unittest.cc.orig	2016-03-25 13:04:49 UTC
++++ device/usb/usb_context_unittest.cc
+@@ -7,7 +7,11 @@
+ #include "build/build_config.h"
+ #include "device/usb/usb_context.h"
+ #include "testing/gtest/include/gtest/gtest.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ namespace device {
+ 
diff --git a/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc b/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
new file mode 100644
index 000000000000..d505313d4131
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__device__handle__impl.cc
@@ -0,0 +1,15 @@
+--- device/usb/usb_device_handle_impl.cc.orig	2016-05-11 19:02:22 UTC
++++ device/usb/usb_device_handle_impl.cc
+@@ -24,7 +24,11 @@
+ #include "device/usb/usb_error.h"
+ #include "device/usb/usb_service.h"
+ #include "net/base/io_buffer.h"
+-#include "third_party/libusb/src/libusb/libusb.h"
++#if defined(OS_FREEBSD)
++#  include "libusb.h"
++#else
++#  include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ namespace device {
+ 
diff --git a/www/chromium/files/patch-device_usb_usb__device__handle__impl.h b/www/chromium/files/patch-device_usb_usb__device__handle__impl.h
new file mode 100644
index 000000000000..26ed0621702e
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__device__handle__impl.h
@@ -0,0 +1,15 @@
+--- device/usb/usb_device_handle_impl.h.orig	2016-05-11 19:02:22 UTC
++++ device/usb/usb_device_handle_impl.h
+@@ -17,7 +17,12 @@
+ #include "base/memory/ref_counted.h"
+ #include "base/threading/thread_checker.h"
+ #include "device/usb/usb_device_handle.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#define LIBUSB_CALL
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ namespace base {
+ class SequencedTaskRunner;
diff --git a/www/chromium/files/patch-device_usb_usb__device__impl.cc b/www/chromium/files/patch-device_usb_usb__device__impl.cc
new file mode 100644
index 000000000000..18ae2610adb7
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__device__impl.cc
@@ -0,0 +1,14 @@
+--- device/usb/usb_device_impl.cc.orig	2016-05-11 19:02:22 UTC
++++ device/usb/usb_device_impl.cc
+@@ -20,7 +20,11 @@
+ #include "device/usb/usb_descriptors.h"
+ #include "device/usb/usb_device_handle_impl.h"
+ #include "device/usb/usb_error.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ #if defined(OS_CHROMEOS)
+ #include "chromeos/dbus/dbus_thread_manager.h"
diff --git a/www/chromium/files/patch-device_usb_usb__error.cc b/www/chromium/files/patch-device_usb_usb__error.cc
new file mode 100644
index 000000000000..c97d848a21a3
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__error.cc
@@ -0,0 +1,14 @@
+--- device/usb/usb_error.cc.orig	2016-03-25 13:04:49 UTC
++++ device/usb/usb_error.cc
+@@ -4,7 +4,11 @@
+ 
+ #include "device/usb/usb_error.h"
+ 
++#if defined(__FreeBSD__)
++#include "libusb.h"
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ namespace device {
+ 
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.cc b/www/chromium/files/patch-device_usb_usb__service__impl.cc
new file mode 100644
index 000000000000..d27c286e834f
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__service__impl.cc
@@ -0,0 +1,60 @@
+--- device/usb/usb_service_impl.cc.orig	2016-05-11 19:02:22 UTC
++++ device/usb/usb_service_impl.cc
+@@ -24,7 +24,11 @@
+ #include "device/usb/usb_error.h"
+ #include "device/usb/webusb_descriptors.h"
+ #include "net/base/io_buffer.h"
+-#include "third_party/libusb/src/libusb/libusb.h"
++#if defined(OS_FREEBSD)
++#  include <libusb.h>
++#else
++#  include "third_party/libusb/src/libusb/libusb.h"
++#endif
+ 
+ #if defined(OS_WIN)
+ #include <setupapi.h>
+@@ -292,6 +296,7 @@ UsbServiceImpl::UsbServiceImpl(
+   }
+   context_ = new UsbContext(platform_context);
+ 
++#if !defined(OS_FREEBSD)
+   rv = libusb_hotplug_register_callback(
+       context_->context(),
+       static_cast<libusb_hotplug_event>(LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED |
+@@ -304,6 +309,8 @@ UsbServiceImpl::UsbServiceImpl(
+   }
+ 
+   RefreshDevices();
++#endif // !defined(OS_FREEBSD)
++
+ #if defined(OS_WIN)
+   DeviceMonitorWin* device_monitor = DeviceMonitorWin::GetForAllInterfaces();
+   if (device_monitor) {
+@@ -313,9 +320,11 @@ UsbServiceImpl::UsbServiceImpl(
+ }
+ 
+ UsbServiceImpl::~UsbServiceImpl() {
++#if !defined(OS_FREEBSD)
+   if (hotplug_enabled_) {
+     libusb_hotplug_deregister_callback(context_->context(), hotplug_handle_);
+   }
++#endif // !defined(OS_FREEBSD)
+   for (const auto& map_entry : devices_) {
+     map_entry.second->OnDisconnect();
+   }
+@@ -553,6 +562,7 @@ void UsbServiceImpl::RemoveDevice(scoped
+   device->OnDisconnect();
+ }
+ 
++#if !defined(OS_FREEBSD)
+ // static
+ int LIBUSB_CALL UsbServiceImpl::HotplugCallback(libusb_context* context,
+                                                 PlatformUsbDevice device,
+@@ -590,6 +600,7 @@ int LIBUSB_CALL UsbServiceImpl::HotplugC
+ 
+   return 0;
+ }
++#endif // !defined(OS_FREEBSD)
+ 
+ void UsbServiceImpl::OnPlatformDeviceAdded(PlatformUsbDevice platform_device) {
+   DCHECK(CalledOnValidThread());
diff --git a/www/chromium/files/patch-device_usb_usb__service__impl.h b/www/chromium/files/patch-device_usb_usb__service__impl.h
new file mode 100644
index 000000000000..de86e5a41dd9
--- /dev/null
+++ b/www/chromium/files/patch-device_usb_usb__service__impl.h
@@ -0,0 +1,40 @@
+--- device/usb/usb_service_impl.h.orig	2016-05-11 19:02:22 UTC
++++ device/usb/usb_service_impl.h
+@@ -15,7 +15,13 @@
+ #include "build/build_config.h"
+ #include "device/usb/usb_context.h"
+ #include "device/usb/usb_device_impl.h"
++#if defined(OS_FREEBSD)
++#include "libusb.h"
++#define LIBUSB_CALL
++#else
+ #include "third_party/libusb/src/libusb/libusb.h"
++#endif
++
+ 
+ #if defined(OS_WIN)
+ #include "base/scoped_observer.h"
+@@ -71,11 +77,13 @@ class UsbServiceImpl :
+                  scoped_refptr<UsbDeviceImpl> device);
+   void RemoveDevice(scoped_refptr<UsbDeviceImpl> device);
+ 
++#if !defined(OS_FREEBSD)
+   // Handle hotplug events from libusb.
+   static int LIBUSB_CALL HotplugCallback(libusb_context* context,
+                                          PlatformUsbDevice device,
+                                          libusb_hotplug_event event,
+                                          void* user_data);
++#endif
+   // These functions release a reference to the provided platform device.
+   void OnPlatformDeviceAdded(PlatformUsbDevice platform_device);
+   void OnPlatformDeviceRemoved(PlatformUsbDevice platform_device);
+@@ -88,7 +96,9 @@ class UsbServiceImpl :
+   // connected instead of only when a full enumeration is requested.
+   // TODO(reillyg): Support this on all platforms. crbug.com/411715
+   bool hotplug_enabled_ = false;
++#if !defined(OS_FREEBSD)
+   libusb_hotplug_callback_handle hotplug_handle_;
++#endif
+ 
+   // Enumeration callbacks are queued until an enumeration completes.
+   bool enumeration_ready_ = false;
diff --git a/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc b/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc
deleted file mode 100644
index 583c2b5e3aea..000000000000
--- a/www/chromium/files/patch-extensions__browser__api__declarative_webrequest__webrequest_action.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2016-03-05 21:30:23.744503770 +0100
-+++ extensions/browser/api/declarative_webrequest/webrequest_action.cc	2016-03-05 21:30:38.440502352 +0100
-@@ -28,7 +28,11 @@
- #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
- #include "net/http/http_util.h"
- #include "net/url_request/url_request.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- using content::ResourceRequestInfo;
- 
diff --git a/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc b/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc
deleted file mode 100644
index d2bcae870f7c..000000000000
--- a/www/chromium/files/patch-extensions__browser__api__serial__serial_api.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- extensions/browser/api/serial/serial_api.cc.orig	2016-03-04 22:52:57.757575528 +0100
-+++ extensions/browser/api/serial/serial_api.cc	2016-03-04 22:52:30.452574585 +0100
-@@ -87,7 +87,8 @@
-   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
- 
- // TODO(moshayedi): crbug.com/549257. Add USB support for Aura on Android.
--#if !defined(OS_ANDROID)
-+// XXX also, rene's quick hack on FreeBSD
-+#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
-   scoped_ptr<device::SerialDeviceEnumerator> enumerator =
-       device::SerialDeviceEnumerator::Create();
-   mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
diff --git a/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc b/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc
deleted file mode 100644
index d1a4f6a9cb81..000000000000
--- a/www/chromium/files/patch-extensions__browser__api__web_request__form_data_parser.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- extensions/browser/api/web_request/form_data_parser.cc.orig	2016-03-05 21:31:37.080498500 +0100
-+++ extensions/browser/api/web_request/form_data_parser.cc	2016-03-05 21:31:50.448497605 +0100
-@@ -15,7 +15,11 @@
- #include "base/values.h"
- #include "net/base/escape.h"
- #include "net/url_request/url_request.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- using base::DictionaryValue;
- using base::ListValue;
diff --git a/www/chromium/files/patch-extensions__common__image_util.cc b/www/chromium/files/patch-extensions__common__image_util.cc
deleted file mode 100644
index 6c05f76af263..000000000000
--- a/www/chromium/files/patch-extensions__common__image_util.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- extensions/common/image_util.cc.orig	2016-03-05 21:28:20.783511398 +0100
-+++ extensions/common/image_util.cc	2016-03-05 21:28:33.615510847 +0100
-@@ -11,7 +11,11 @@
- #include "base/strings/string_number_conversions.h"
- #include "base/strings/string_util.h"
- #include "base/strings/stringprintf.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "third_party/skia/include/core/SkColor.h"
- #include "ui/gfx/color_utils.h"
- 
diff --git a/www/chromium/files/patch-extensions__common__stack_frame.cc b/www/chromium/files/patch-extensions__common__stack_frame.cc
deleted file mode 100644
index 6790a26fd116..000000000000
--- a/www/chromium/files/patch-extensions__common__stack_frame.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- extensions/common/stack_frame.cc.orig	2016-03-05 21:29:12.679508172 +0100
-+++ extensions/common/stack_frame.cc	2016-03-05 21:29:26.039507364 +0100
-@@ -7,7 +7,11 @@
- #include <string>
- 
- #include "base/strings/utf_string_conversions.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace extensions {
- 
diff --git a/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
new file mode 100644
index 000000000000..d4f75b18284b
--- /dev/null
+++ b/www/chromium/files/patch-extensions_browser_api_declarative__webrequest_webrequest__action.cc
@@ -0,0 +1,14 @@
+--- extensions/browser/api/declarative_webrequest/webrequest_action.cc.orig	2016-05-11 19:02:22 UTC
++++ extensions/browser/api/declarative_webrequest/webrequest_action.cc
+@@ -28,7 +28,11 @@
+ #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+ #include "net/http/http_util.h"
+ #include "net/url_request/url_request.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ using content::ResourceRequestInfo;
+ 
diff --git a/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
new file mode 100644
index 000000000000..8d02a3abb95d
--- /dev/null
+++ b/www/chromium/files/patch-extensions_browser_api_serial_serial__api.cc
@@ -0,0 +1,16 @@
+--- extensions/browser/api/serial/serial_api.cc.orig	2016-05-25 15:01:02.000000000 -0400
++++ extensions/browser/api/serial/serial_api.cc	2016-05-27 11:12:01.060235000 -0400
+@@ -86,11 +86,13 @@
+ void SerialGetDevicesFunction::Work() {
+   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
+ 
++#if !defined(OS_BSD)
+   scoped_ptr<device::SerialDeviceEnumerator> enumerator =
+       device::SerialDeviceEnumerator::Create();
+   mojo::Array<device::serial::DeviceInfoPtr> devices = enumerator->GetDevices();
+   results_ = serial::GetDevices::Results::Create(
+       devices.To<std::vector<serial::DeviceInfo>>());
++#endif
+ }
+ 
+ SerialConnectFunction::SerialConnectFunction() {
diff --git a/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
new file mode 100644
index 000000000000..548c1402578e
--- /dev/null
+++ b/www/chromium/files/patch-extensions_browser_api_web__request_form__data__parser.cc
@@ -0,0 +1,14 @@
+--- extensions/browser/api/web_request/form_data_parser.cc.orig	2016-05-11 19:02:22 UTC
++++ extensions/browser/api/web_request/form_data_parser.cc
+@@ -15,7 +15,11 @@
+ #include "base/values.h"
+ #include "net/base/escape.h"
+ #include "net/url_request/url_request.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ using base::DictionaryValue;
+ using base::ListValue;
diff --git a/www/chromium/files/patch-extensions_common_image__util.cc b/www/chromium/files/patch-extensions_common_image__util.cc
new file mode 100644
index 000000000000..35efa55d4ae3
--- /dev/null
+++ b/www/chromium/files/patch-extensions_common_image__util.cc
@@ -0,0 +1,14 @@
+--- extensions/common/image_util.cc.orig	2016-05-11 19:02:22 UTC
++++ extensions/common/image_util.cc
+@@ -11,7 +11,11 @@
+ #include "base/strings/string_number_conversions.h"
+ #include "base/strings/string_util.h"
+ #include "base/strings/stringprintf.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "third_party/skia/include/core/SkColor.h"
+ #include "ui/gfx/color_utils.h"
+ 
diff --git a/www/chromium/files/patch-extensions_common_stack__frame.cc b/www/chromium/files/patch-extensions_common_stack__frame.cc
new file mode 100644
index 000000000000..8ec9f8bcd9b7
--- /dev/null
+++ b/www/chromium/files/patch-extensions_common_stack__frame.cc
@@ -0,0 +1,14 @@
+--- extensions/common/stack_frame.cc.orig	2016-05-11 19:02:22 UTC
++++ extensions/common/stack_frame.cc
+@@ -7,7 +7,11 @@
+ #include <string>
+ 
+ #include "base/strings/utf_string_conversions.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace extensions {
+ 
diff --git a/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc b/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc
deleted file mode 100644
index 65b309ad981f..000000000000
--- a/www/chromium/files/patch-gpu__command_buffer__service__program_manager.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- gpu/command_buffer/service/program_manager.cc.orig	2016-03-05 21:34:10.137487636 +0100
-+++ gpu/command_buffer/service/program_manager.cc	2016-03-05 21:35:00.089484564 +0100
-@@ -29,7 +29,11 @@
- #include "gpu/command_buffer/service/gpu_switches.h"
- #include "gpu/command_buffer/service/program_cache.h"
- #include "gpu/command_buffer/service/shader_manager.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- #include "ui/gl/gl_version_info.h"
- 
- using base::TimeDelta;
diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list.cc b/www/chromium/files/patch-gpu__config__gpu_control_list.cc
deleted file mode 100644
index ce327650f571..000000000000
--- a/www/chromium/files/patch-gpu__config__gpu_control_list.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- gpu/config/gpu_control_list.cc.orig	2016-03-05 21:33:12.769491937 +0100
-+++ gpu/config/gpu_control_list.cc	2016-03-05 21:33:28.281491345 +0100
-@@ -17,7 +17,11 @@
- #include "base/sys_info.h"
- #include "gpu/config/gpu_info.h"
- #include "gpu/config/gpu_util.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- namespace gpu {
- namespace {
diff --git a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc b/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
deleted file mode 100644
index b1da2bcf8b34..000000000000
--- a/www/chromium/files/patch-gpu__config__gpu_control_list_unittest.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- gpu/config/gpu_control_list_unittest.cc.orig	2014-10-10 08:54:15 UTC
-+++ gpu/config/gpu_control_list_unittest.cc
-@@ -177,8 +177,7 @@
-   features = control_list->MakeDecision(
-       GpuControlList::kOsLinux, kOsVersion, gpu_info());
-   EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
--    defined(OS_OPENBSD)
-+#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))
-   // ControlList entries will be filtered to the current OS only upon loading.
-   EXPECT_TRUE(control_list->LoadList(
-       vendor_json, GpuControlList::kCurrentOsOnly));
diff --git a/www/chromium/files/patch-gpu__config__gpu_info_collector.cc b/www/chromium/files/patch-gpu__config__gpu_info_collector.cc
deleted file mode 100644
index c3da599b9cb3..000000000000
--- a/www/chromium/files/patch-gpu__config__gpu_info_collector.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- gpu/config/gpu_info_collector.cc.orig	2016-03-04 22:55:40.742558914 +0100
-+++ gpu/config/gpu_info_collector.cc	2016-03-04 22:55:58.941556712 +0100
-@@ -167,8 +167,10 @@
-   gpu_info->pixel_shader_version = glsl_version;
-   gpu_info->vertex_shader_version = glsl_version;
- 
-+#ifndef __FreeBSD__
-   IdentifyActiveGPU(gpu_info);
-   return CollectDriverInfoGL(gpu_info);
-+#endif
- }
- 
- void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
diff --git a/www/chromium/files/patch-gpu__config__gpu_test_config.cc b/www/chromium/files/patch-gpu__config__gpu_test_config.cc
deleted file mode 100644
index 86551afb8f10..000000000000
--- a/www/chromium/files/patch-gpu__config__gpu_test_config.cc
+++ /dev/null
@@ -1,30 +0,0 @@
---- gpu/config/gpu_test_config.cc.orig	2014-10-10 08:54:15 UTC
-+++ gpu/config/gpu_test_config.cc
-@@ -23,7 +23,7 @@
- GPUTestConfig::OS GetCurrentOS() {
- #if defined(OS_CHROMEOS)
-   return GPUTestConfig::kOsChromeOS;
--#elif defined(OS_LINUX) || defined(OS_OPENBSD)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   return GPUTestConfig::kOsLinux;
- #elif defined(OS_WIN)
-   int32 major_version = 0;
-@@ -233,6 +233,10 @@
-   bool rt;
-   if (gpu_info == NULL) {
-     GPUInfo my_gpu_info;
-+#if defined(OS_FREEBSD)
-+    rt = false;
-+    LOG(WARNING) << "CollectGpuID not present on FreeBSD";
-+#else
-     CollectInfoResult result = CollectGpuID(
-         &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
-     if (result != kCollectInfoSuccess) {
-@@ -242,6 +246,7 @@
-     } else {
-       rt = SetGPUInfo(my_gpu_info);
-     }
-+#endif
-   } else {
-     rt = SetGPUInfo(*gpu_info);
-   }
diff --git a/www/chromium/files/patch-gpu__config__gpu_util.cc b/www/chromium/files/patch-gpu__config__gpu_util.cc
deleted file mode 100644
index 3e9412a4d9ab..000000000000
--- a/www/chromium/files/patch-gpu__config__gpu_util.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- gpu/config/gpu_util.cc.orig	2015-04-19 16:27:01.000000000 +0200
-+++ gpu/config/gpu_util.cc	2015-04-19 16:27:30.000000000 +0200
-@@ -54,10 +54,12 @@
- }
- 
- void ApplyGpuDriverBugWorkarounds(base::CommandLine* command_line) {
-+#ifndef __FreeBSD__
-   GPUInfo gpu_info;
-   CollectBasicGraphicsInfo(&gpu_info);
- 
-   ApplyGpuDriverBugWorkarounds(gpu_info, command_line);
-+#endif
- }
- 
- void ApplyGpuDriverBugWorkarounds(const GPUInfo& gpu_info,
diff --git a/www/chromium/files/patch-gpu__gpu_config.gypi b/www/chromium/files/patch-gpu__gpu_config.gypi
deleted file mode 100644
index f4397facdf9d..000000000000
--- a/www/chromium/files/patch-gpu__gpu_config.gypi
+++ /dev/null
@@ -1,23 +0,0 @@
---- gpu/gpu_config.gypi.orig	2015-04-19 16:30:17.000000000 +0200
-+++ gpu/gpu_config.gypi	2015-04-19 16:33:04.000000000 +0200
-@@ -70,7 +70,7 @@
-         '../build/linux/system.gyp:libpci',
-       ],
-     }],
--    ['OS=="linux" and use_x11==1', {
-+    ['(OS=="linux" or os_bsd==1) and use_x11==1', {
-       'dependencies': [
-         '../build/linux/system.gyp:x11',
-         '../build/linux/system.gyp:xext',
-@@ -78,5 +78,11 @@
-         '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
-       ],
-     }],
-+    ['os_bsd==1', {
-+      'sources!': [
-+        'config/gpu_info_collector_linux.cc',
-+        'config/gpu_info_collector_linux.h',
-+      ],
-+    }]
-   ],
- }
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
new file mode 100644
index 000000000000..5e3bc489efc1
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_program__manager.cc
@@ -0,0 +1,14 @@
+--- gpu/command_buffer/service/program_manager.cc.orig	2016-05-11 19:02:23 UTC
++++ gpu/command_buffer/service/program_manager.cc
+@@ -29,7 +29,11 @@
+ #include "gpu/command_buffer/service/gpu_switches.h"
+ #include "gpu/command_buffer/service/program_cache.h"
+ #include "gpu/command_buffer/service/shader_manager.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ #include "ui/gl/gl_version_info.h"
+ 
+ using base::TimeDelta;
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
new file mode 100644
index 000000000000..a6c03a0ae8f9
--- /dev/null
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -0,0 +1,14 @@
+--- gpu/config/gpu_control_list.cc.orig	2016-05-11 19:02:23 UTC
++++ gpu/config/gpu_control_list.cc
+@@ -17,7 +17,11 @@
+ #include "base/sys_info.h"
+ #include "gpu/config/gpu_info.h"
+ #include "gpu/config/gpu_util.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ namespace gpu {
+ namespace {
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
new file mode 100644
index 000000000000..b6b427da9ab6
--- /dev/null
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list__unittest.cc
@@ -0,0 +1,12 @@
+--- gpu/config/gpu_control_list_unittest.cc.orig	2016-05-11 19:02:23 UTC
++++ gpu/config/gpu_control_list_unittest.cc
+@@ -175,8 +175,7 @@ TEST_F(GpuControlListTest, VendorOnAllOs
+   features = control_list->MakeDecision(
+       GpuControlList::kOsLinux, kOsVersion, gpu_info());
+   EXPECT_SINGLE_FEATURE(features, TEST_FEATURE_0);
+-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
+-    defined(OS_OPENBSD)
++#if defined(OS_WIN) || (defined(OS_POSIX) && !defined(OS_ANDROID))
+   // ControlList entries will be filtered to the current OS only upon loading.
+   EXPECT_TRUE(control_list->LoadList(
+       vendor_json, GpuControlList::kCurrentOsOnly));
diff --git a/www/chromium/files/patch-gpu_config_gpu__info__collector.cc b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
new file mode 100644
index 000000000000..428cb20ceec2
--- /dev/null
+++ b/www/chromium/files/patch-gpu_config_gpu__info__collector.cc
@@ -0,0 +1,13 @@
+--- gpu/config/gpu_info_collector.cc.orig	2016-05-11 19:02:23 UTC
++++ gpu/config/gpu_info_collector.cc
+@@ -167,8 +167,10 @@ CollectInfoResult CollectGraphicsInfoGL(
+   gpu_info->pixel_shader_version = glsl_version;
+   gpu_info->vertex_shader_version = glsl_version;
+ 
++#ifndef __FreeBSD__
+   IdentifyActiveGPU(gpu_info);
+   return CollectDriverInfoGL(gpu_info);
++#endif
+ }
+ 
+ void MergeGPUInfoGL(GPUInfo* basic_gpu_info,
diff --git a/www/chromium/files/patch-gpu_config_gpu__test__config.cc b/www/chromium/files/patch-gpu_config_gpu__test__config.cc
new file mode 100644
index 000000000000..1beca5d603e9
--- /dev/null
+++ b/www/chromium/files/patch-gpu_config_gpu__test__config.cc
@@ -0,0 +1,30 @@
+--- gpu/config/gpu_test_config.cc.orig	2016-05-11 19:02:23 UTC
++++ gpu/config/gpu_test_config.cc
+@@ -26,7 +26,7 @@ namespace {
+ GPUTestConfig::OS GetCurrentOS() {
+ #if defined(OS_CHROMEOS)
+   return GPUTestConfig::kOsChromeOS;
+-#elif defined(OS_LINUX) || defined(OS_OPENBSD)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   return GPUTestConfig::kOsLinux;
+ #elif defined(OS_WIN)
+   int32_t major_version = 0;
+@@ -252,6 +252,10 @@ bool GPUTestBotConfig::LoadCurrentConfig
+   bool rt;
+   if (gpu_info == NULL) {
+     GPUInfo my_gpu_info;
++#if defined(OS_FREEBSD)
++    rt = false;
++    LOG(WARNING) << "CollectGpuID not present on FreeBSD";
++#else
+     CollectInfoResult result = CollectGpuID(
+         &my_gpu_info.gpu.vendor_id, &my_gpu_info.gpu.device_id);
+     if (result != kCollectInfoSuccess) {
+@@ -261,6 +265,7 @@ bool GPUTestBotConfig::LoadCurrentConfig
+     } else {
+       rt = SetGPUInfo(my_gpu_info);
+     }
++#endif
+   } else {
+     rt = SetGPUInfo(*gpu_info);
+   }
diff --git a/www/chromium/files/patch-gpu_gpu__config.gypi b/www/chromium/files/patch-gpu_gpu__config.gypi
new file mode 100644
index 000000000000..bb49c8e9832b
--- /dev/null
+++ b/www/chromium/files/patch-gpu_gpu__config.gypi
@@ -0,0 +1,23 @@
+--- gpu/gpu_config.gypi.orig	2016-05-11 19:02:23 UTC
++++ gpu/gpu_config.gypi
+@@ -71,7 +71,7 @@
+         '../build/linux/system.gyp:libpci',
+       ],
+     }],
+-    ['OS=="linux" and use_x11==1', {
++    ['(OS=="linux" or os_bsd==1) and use_x11==1', {
+       'dependencies': [
+         '../build/linux/system.gyp:x11',
+         '../build/linux/system.gyp:xext',
+@@ -79,5 +79,11 @@
+         '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
+       ],
+     }],
++    ['os_bsd==1', {
++      'sources!': [
++        'config/gpu_info_collector_linux.cc',
++        'config/gpu_info_collector_linux.h',
++      ],
++    }]
+   ],
+ }
diff --git a/www/chromium/files/patch-gpu_gpu__ipc__service.gypi b/www/chromium/files/patch-gpu_gpu__ipc__service.gypi
new file mode 100644
index 000000000000..fc305796f4e1
--- /dev/null
+++ b/www/chromium/files/patch-gpu_gpu__ipc__service.gypi
@@ -0,0 +1,11 @@
+--- gpu/gpu_ipc_service.gypi.orig	2016-05-27 10:20:52.022966000 -0400
++++ gpu/gpu_ipc_service.gypi	2016-05-27 10:21:13.721757000 -0400
+@@ -82,7 +82,7 @@
+         ],
+       },
+     }],
+-    ['OS=="linux"', {
++    ['OS=="linux" or os_bsd==1', {
+       'sources': [ 'ipc/service/image_transport_surface_linux.cc' ],
+     }],
+     ['use_x11 == 1 and (target_arch != "arm" or chromeos == 0)', {
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.cc b/www/chromium/files/patch-ipc_ipc__message__utils.cc
new file mode 100644
index 000000000000..f3b95c29a0b7
--- /dev/null
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.cc
@@ -0,0 +1,11 @@
+--- ipc/ipc_message_utils.cc.orig	2016-05-20 21:47:31 UTC
++++ ipc/ipc_message_utils.cc
+@@ -414,7 +414,7 @@ void ParamTraits<unsigned int>::Log(cons
+   l->append(base::UintToString(p));
+ }
+ 
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ void ParamTraits<long>::Log(const param_type& p, std::string* l) {
+   l->append(base::Int64ToString(static_cast<int64_t>(p)));
diff --git a/www/chromium/files/patch-ipc_ipc__message__utils.h b/www/chromium/files/patch-ipc_ipc__message__utils.h
new file mode 100644
index 000000000000..7267337263e1
--- /dev/null
+++ b/www/chromium/files/patch-ipc_ipc__message__utils.h
@@ -0,0 +1,11 @@
+--- ipc/ipc_message_utils.h.orig	2016-05-20 21:46:12 UTC
++++ ipc/ipc_message_utils.h
+@@ -193,7 +193,7 @@ struct ParamTraits<unsigned int> {
+ //   3) Android 64 bit also has int64_t typedef'd to long.
+ // Since we want to support Android 32<>64 bit IPC, as long as we don't have
+ // these traits for 32 bit ARM then that'll catch any errors.
+-#if defined(OS_WIN) || defined(OS_LINUX) || \
++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \
+     (defined(OS_ANDROID) && defined(ARCH_CPU_64_BITS))
+ template <>
+ struct ParamTraits<long> {
diff --git a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc b/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
deleted file mode 100644
index f88654f232b4..000000000000
--- a/www/chromium/files/patch-media__audio__alsa__audio_manager_alsa.cc
+++ /dev/null
@@ -1,54 +0,0 @@
---- media/audio/alsa/audio_manager_alsa.cc.orig	2016-04-07 19:01:10 UTC
-+++ media/audio/alsa/audio_manager_alsa.cc
-@@ -128,7 +128,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
-   int card = -1;
- 
-   // Loop through the sound cards to get ALSA device hints.
-+#ifdef OS_LINUX
-   while (!wrapper_->CardNext(&card) && card >= 0) {
-+#endif
-     void** hints = NULL;
-     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
-     if (!error) {
-@@ -140,7 +142,9 @@ void AudioManagerAlsa::GetAlsaAudioDevic
-       DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: "
-                     << wrapper_->StrError(error);
-     }
-+#ifdef OS_LINUX
-   }
-+#endif
- }
- 
- void AudioManagerAlsa::GetAlsaDevicesInfo(
-@@ -226,7 +230,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvail
-     // goes through software conversion if needed (e.g. incompatible
-     // sample rate).
-     // TODO(joi): Should we prefer "hw" instead?
-+#ifdef OS_LINUX
-     static const char kDeviceTypeDesired[] = "plughw";
-+#else
-+    static const char kDeviceTypeDesired[] = "plug";
-+#endif
-     return strncmp(kDeviceTypeDesired,
-                    device_name,
-                    arraysize(kDeviceTypeDesired) - 1) == 0;
-@@ -250,7 +258,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
-   // Loop through the sound cards.
-   // Don't use snd_device_name_hint(-1,..) since there is a access violation
-   // inside this ALSA API with libasound.so.2.0.0.
-+#ifdef OS_LINUX
-   while (!wrapper_->CardNext(&card) && (card >= 0) && !has_device) {
-+#endif
-     int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints);
-     if (!error) {
-       for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) {
-@@ -274,7 +284,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDe
-       DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: "
-                     << wrapper_->StrError(error);
-     }
-+#ifdef OS_LINUX
-   }
-+#endif
- 
-   return has_device;
- }
diff --git a/www/chromium/files/patch-media__audio__audio_manager.cc b/www/chromium/files/patch-media__audio__audio_manager.cc
deleted file mode 100644
index e527c083c52a..000000000000
--- a/www/chromium/files/patch-media__audio__audio_manager.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- media/audio/audio_manager.cc.orig	2015-12-05 21:00:28.652308000 +0100
-+++ media/audio/audio_manager.cc	2015-12-05 21:00:59.340983000 +0100
-@@ -157,7 +157,7 @@
-   }
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   void set_app_name(const std::string& app_name) {
-     app_name_ = app_name;
-   }
-@@ -184,7 +184,7 @@
-   scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
- #endif
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   std::string app_name_;
- #endif
- 
-@@ -267,7 +267,7 @@
- #endif
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- // static
- void AudioManager::SetGlobalAppName(const std::string& app_name) {
-   g_helper.Pointer()->set_app_name(app_name);
diff --git a/www/chromium/files/patch-media__audio__audio_manager.h b/www/chromium/files/patch-media__audio__audio_manager.h
deleted file mode 100644
index be9a78b1400f..000000000000
--- a/www/chromium/files/patch-media__audio__audio_manager.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/audio/audio_manager.h.orig	2015-12-05 22:20:38.929937000 +0100
-+++ media/audio/audio_manager.h	2015-12-05 22:21:06.651164000 +0100
-@@ -61,7 +61,7 @@
-   // called previously to start the hang monitor.  Does nothing on OSX.
-   static void EnableHangMonitor();
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-   // Sets the name of the audio source as seen by external apps. Only actually
-   // used with PulseAudio as of this writing.
-   static void SetGlobalAppName(const std::string& app_name);
diff --git a/www/chromium/files/patch-media__base__audio_splicer.cc b/www/chromium/files/patch-media__base__audio_splicer.cc
deleted file mode 100644
index ee90d95cc4f6..000000000000
--- a/www/chromium/files/patch-media__base__audio_splicer.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/base/audio_splicer.cc.orig	2014-10-10 08:54:15 UTC
-+++ media/base/audio_splicer.cc
-@@ -137,7 +137,7 @@
-       output_timestamp_helper_.GetTimestamp();
-   const base::TimeDelta delta = timestamp - expected_timestamp;
- 
--  if (std::abs(delta.InMilliseconds()) >
-+  if (std::labs(delta.InMilliseconds()) >
-       AudioSplicer::kMaxTimeDeltaInMilliseconds) {
-     DVLOG(1) << "Timestamp delta too large: " << delta.InMicroseconds() << "us";
-     return false;
-@@ -147,7 +147,7 @@
-   if (delta != base::TimeDelta())
-     frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp);
- 
--  if (frames_to_fill == 0 || std::abs(frames_to_fill) < kMinGapSize) {
-+  if (frames_to_fill == 0 || std::labs(frames_to_fill) < kMinGapSize) {
-     AddOutputBuffer(input);
-     return true;
-   }
diff --git a/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
deleted file mode 100644
index 2c7bc9353a2f..000000000000
--- a/www/chromium/files/patch-media__capture__video__fake_video_capture_device_factory.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/capture/video/fake_video_capture_device_factory.cc.orig	2015-10-14 17:33:35.934406000 +0200
-+++ media/capture/video/fake_video_capture_device_factory.cc	2015-10-14 17:34:01.687650000 +0200
-@@ -51,7 +51,7 @@
-   for (int n = 0; n < number_of_devices_; ++n) {
-     VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
-                                   base::StringPrintf("/dev/video%d", n)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-                                       ,
-                                   VideoCaptureDevice::Name::V4L2_SINGLE_PLANE
- #elif defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
deleted file mode 100644
index 0847e219c1ee..000000000000
--- a/www/chromium/files/patch-media__capture__video__file_video_capture_device_factory.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/capture/video/file_video_capture_device_factory.cc.orig	2015-10-14 17:42:06.832425000 +0200
-+++ media/capture/video/file_video_capture_device_factory.cc	2015-10-14 17:42:45.561757000 +0200
-@@ -49,7 +49,7 @@
-   device_names->push_back(VideoCaptureDevice::Name(
-       command_line_file_path.value(), kFileVideoCaptureDeviceName,
-       VideoCaptureDevice::Name::AVFOUNDATION));
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   device_names->push_back(VideoCaptureDevice::Name(
-       command_line_file_path.value(), kFileVideoCaptureDeviceName,
-       VideoCaptureDevice::Name::V4L2_SINGLE_PLANE));
diff --git a/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc b/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
deleted file mode 100644
index c294670fddbe..000000000000
--- a/www/chromium/files/patch-media__capture__video__linux__video_capture_device_linux.cc
+++ /dev/null
@@ -1,62 +0,0 @@
---- media/capture/video/linux/video_capture_device_linux.cc.orig	2015-11-24 21:00:55.000000000 +0100
-+++ media/capture/video/linux/video_capture_device_linux.cc	2015-12-05 22:01:43.229465000 +0100
-@@ -41,6 +41,7 @@
-   return true;
- }
- 
-+#if !defined(OS_FREEBSD)
- // Translates Video4Linux pixel formats to Chromium pixel formats.
- // static
- VideoPixelFormat
-@@ -54,6 +55,7 @@
-     bool favour_mjpeg) {
-   return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
- }
-+#endif // !defined(OS_FREEBSD)
- 
- const std::string VideoCaptureDevice::Name::GetModel() const {
-   // |unique_id| is of the form "/dev/video2".  |file_name| is "video2".
-@@ -88,6 +90,7 @@
-   v4l2_thread_.Stop();
- }
- 
-+#if !defined(OS_FREEBSD)
- void VideoCaptureDeviceLinux::AllocateAndStart(
-     const VideoCaptureParams& params,
-     scoped_ptr<VideoCaptureDevice::Client> client) {
-@@ -111,7 +114,13 @@
-                  params.requested_format.frame_size.height(),
-                  params.requested_format.frame_rate, base::Passed(&client)));
- }
-+#else // !defined(OS_FREEBSD)
-+void VideoCaptureDeviceLinux::AllocateAndStart(
-+    const VideoCaptureParams& params,
-+    scoped_ptr<VideoCaptureDevice::Client> client) {}
-+#endif // !defined(OS_FREEBSD)
- 
-+#if !defined(OS_FREEBSD)
- void VideoCaptureDeviceLinux::StopAndDeAllocate() {
-   if (!v4l2_thread_.IsRunning())
-     return;  // Wrong state.
-@@ -122,7 +131,11 @@
- 
-   capture_impl_ = NULL;
- }
-+#else // !defined(OS_FREEBSD)
-+void VideoCaptureDeviceLinux::StopAndDeAllocate() {}
-+#endif // !defined(OS_FREEBSD)
- 
-+#if !defined(OS_FREEBSD)
- void VideoCaptureDeviceLinux::SetRotation(int rotation) {
-   if (v4l2_thread_.IsRunning()) {
-     v4l2_thread_.message_loop()->PostTask(
-@@ -130,6 +143,9 @@
-         base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
-   }
- }
-+#else // !defined(OS_FREEBSD)
-+void VideoCaptureDeviceLinux::SetRotation(int rotation) {}
-+#endif // !defined(OS_FREEBSD)
- 
- // static
- int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(int frequency) {
diff --git a/www/chromium/files/patch-media__capture__video__video_capture_device.cc b/www/chromium/files/patch-media__capture__video__video_capture_device.cc
deleted file mode 100644
index 6b494af58f3a..000000000000
--- a/www/chromium/files/patch-media__capture__video__video_capture_device.cc
+++ /dev/null
@@ -1,31 +0,0 @@
---- media/capture/video/video_capture_device.cc.orig	2015-12-04 22:51:59.984494000 +0100
-+++ media/capture/video/video_capture_device.cc	2015-12-04 22:53:28.114262000 +0100
-@@ -11,6 +11,10 @@
- 
- namespace media {
- 
-+const std::string VideoCaptureDevice::Name::GetModel() const {
-+  return "";
-+}
-+
- // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour
- // of deferring GetModel() call to the actual VideoCaptureDevice object.
- const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
-@@ -33,7 +37,7 @@
-     : device_name_(name), unique_id_(id) {
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- VideoCaptureDevice::Name::Name(const std::string& name,
-                                const std::string& id,
-                                const CaptureApiType api_type)
-@@ -80,7 +84,7 @@
- VideoCaptureDevice::Name::~Name() {
- }
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
-   switch (capture_api_type()) {
-     case V4L2_SINGLE_PLANE:
diff --git a/www/chromium/files/patch-media__capture__video__video_capture_device.h b/www/chromium/files/patch-media__capture__video__video_capture_device.h
deleted file mode 100644
index a46323584218..000000000000
--- a/www/chromium/files/patch-media__capture__video__video_capture_device.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- media/capture/video/video_capture_device.h.orig	2015-10-14 18:04:30.325845000 +0200
-+++ media/capture/video/video_capture_device.h	2015-10-14 18:06:41.271627000 +0200
-@@ -43,7 +43,7 @@
-     Name();
-     Name(const std::string& name, const std::string& id);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     // Linux/CrOS targets Capture Api type: it can only be set on construction.
-     enum CaptureApiType {
-       V4L2_SINGLE_PLANE,
-@@ -75,7 +75,7 @@
- #endif
- 
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
--    defined(OS_ANDROID)
-+    defined(OS_ANDROID) || defined(OS_BSD)
-     Name(const std::string& name,
-          const std::string& id,
-          const CaptureApiType api_type);
-@@ -112,7 +112,7 @@
-     bool operator<(const Name& other) const { return unique_id_ < other.id(); }
- 
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
--    defined(OS_ANDROID)
-+    defined(OS_ANDROID) || defined(OS_BSD)
-     CaptureApiType capture_api_type() const {
-       return capture_api_class_.capture_api_type();
-     }
-@@ -136,7 +136,7 @@
-     std::string device_name_;
-     std::string unique_id_;
- #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
--    defined(OS_ANDROID)
-+    defined(OS_ANDROID) || defined(OS_BSD)
-     // This class wraps the CaptureApiType to give it a by default value if not
-     // initialized.
-     class CaptureApiClass {
diff --git a/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc b/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
deleted file mode 100644
index ee7e842ec044..000000000000
--- a/www/chromium/files/patch-media__capture__video__video_capture_device_factory.cc
+++ /dev/null
@@ -1,21 +0,0 @@
---- media/capture/video/video_capture_device_factory.cc.orig	2015-10-14 18:11:45.655658000 +0200
-+++ media/capture/video/video_capture_device_factory.cc	2015-10-14 18:13:09.785092000 +0200
-@@ -14,6 +14,10 @@
- // static
- scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory(
-     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
-+#if defined(OS_BSD)
-+  return scoped_ptr<VideoCaptureDeviceFactory>(new
-+      media::FakeVideoCaptureDeviceFactory());
-+#else
-   const base::CommandLine* command_line =
-       base::CommandLine::ForCurrentProcess();
-   // Use a Fake or File Video Device Factory if the command line flags are
-@@ -32,6 +36,7 @@
-     return scoped_ptr<VideoCaptureDeviceFactory>(
-         CreateVideoCaptureDeviceFactory(ui_task_runner));
-   }
-+#endif
- }
- 
- VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
diff --git a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc b/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
deleted file mode 100644
index 03397a5bbef4..000000000000
--- a/www/chromium/files/patch-media__filters__decrypting_audio_decoder.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- media/filters/decrypting_audio_decoder.cc.orig	2016-03-04 23:02:30.943530609 +0100
-+++ media/filters/decrypting_audio_decoder.cc	2016-03-04 23:02:36.647530119 +0100
-@@ -29,7 +29,7 @@
-   // Out of sync of 100ms would be pretty noticeable and we should keep any
-   // drift below that.
-   const int64_t kOutOfSyncThresholdInMilliseconds = 100;
--  return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
-+  return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
-          kOutOfSyncThresholdInMilliseconds;
- }
- 
diff --git a/www/chromium/files/patch-media__filters__vp9_parser.h b/www/chromium/files/patch-media__filters__vp9_parser.h
deleted file mode 100644
index dd2458355637..000000000000
--- a/www/chromium/files/patch-media__filters__vp9_parser.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- media/filters/vp9_parser.h.orig	2015-12-16 23:46:15.092527599 +0100
-+++ media/filters/vp9_parser.h	2015-12-16 23:46:43.476526238 +0100
-@@ -14,6 +14,7 @@
- 
- #include <stddef.h>
- #include <stdint.h>
-+#include <unistd.h>
- 
- #include <deque>
- 
diff --git a/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc b/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc
deleted file mode 100644
index f132845e8abb..000000000000
--- a/www/chromium/files/patch-media__formats__common__offset_byte_queue.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- media/formats/common/offset_byte_queue.cc.orig	2016-03-04 23:04:36.711520923 +0100
-+++ media/formats/common/offset_byte_queue.cc	2016-03-04 23:04:56.247519728 +0100
-@@ -46,13 +46,13 @@
-   *size = tail() - offset;
- }
- 
--bool OffsetByteQueue::Trim(int64_t max_offset) {
--  if (max_offset < head_) return true;
--  if (max_offset > tail()) {
-+bool OffsetByteQueue::Trim(int64_t _max_offset) {
-+  if (_max_offset < head_) return true;
-+  if (_max_offset > tail()) {
-     Pop(size_);
-     return false;
-   }
--  Pop(max_offset - head_);
-+  Pop(_max_offset - head_);
-   return true;
- }
- 
diff --git a/www/chromium/files/patch-media__formats__common__offset_byte_queue.h b/www/chromium/files/patch-media__formats__common__offset_byte_queue.h
deleted file mode 100644
index ce7274cf3201..000000000000
--- a/www/chromium/files/patch-media__formats__common__offset_byte_queue.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- media/formats/common/offset_byte_queue.h.orig	2016-03-04 23:07:32.287519616 +0100
-+++ media/formats/common/offset_byte_queue.h	2016-03-04 23:07:40.295545738 +0100
-@@ -36,15 +36,15 @@
-   // a null |buf| and a |size| of zero.
-   void PeekAt(int64_t offset, const uint8_t** buf, int* size);
- 
--  // Marks the bytes up to (but not including) |max_offset| as ready for
-+  // Marks the bytes up to (but not including) |_max_offset| as ready for
-   // deletion. This is relatively inexpensive, but will not necessarily reduce
-   // the resident buffer size right away (or ever).
-   //
-   // Returns true if the full range of bytes were successfully trimmed,
--  // including the case where |max_offset| is less than the current head.
--  // Returns false if |max_offset| > tail() (although all bytes currently
-+  // including the case where |_max_offset| is less than the current head.
-+  // Returns false if |_max_offset| > tail() (although all bytes currently
-   // buffered are still cleared).
--  bool Trim(int64_t max_offset);
-+  bool Trim(int64_t _max_offset);
- 
-   // The head and tail positions, in terms of the file's absolute offsets.
-   // tail() is an exclusive bound.
diff --git a/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc b/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc
deleted file mode 100644
index 1de9ce5956d1..000000000000
--- a/www/chromium/files/patch-media__formats__mp2t__es_parser_adts.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- media/formats/mp2t/es_parser_adts.cc.orig	2016-03-04 23:09:52.322624868 +0100
-+++ media/formats/mp2t/es_parser_adts.cc	2016-03-04 23:10:00.912499378 +0100
-@@ -62,11 +62,11 @@
-   const uint8_t* es;
-   es_queue_->Peek(&es, &es_size);
- 
--  int max_offset = es_size - kADTSHeaderMinSize;
--  if (max_offset <= 0)
-+  int _max_offset = es_size - kADTSHeaderMinSize;
-+  if (_max_offset <= 0)
-     return false;
- 
--  for (int offset = 0; offset < max_offset; offset++) {
-+  for (int offset = 0; offset < _max_offset; offset++) {
-     const uint8_t* cur_buf = &es[offset];
-     if (!isAdtsSyncWord(cur_buf))
-       continue;
-@@ -104,7 +104,7 @@
-     return true;
-   }
- 
--  es_queue_->Pop(max_offset);
-+  es_queue_->Pop(_max_offset);
-   return false;
- }
- 
diff --git a/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc b/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc
deleted file mode 100644
index b6f3d18d2e6a..000000000000
--- a/www/chromium/files/patch-media__formats__mp2t__es_parser_mpeg1audio.cc
+++ /dev/null
@@ -1,26 +0,0 @@
---- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2016-03-04 23:10:48.904495386 +0100
-+++ media/formats/mp2t/es_parser_mpeg1audio.cc	2016-03-04 23:10:55.704495029 +0100
-@@ -110,11 +110,11 @@
-   const uint8_t* es;
-   es_queue_->Peek(&es, &es_size);
- 
--  int max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
--  if (max_offset <= 0)
-+  int _max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
-+  if (_max_offset <= 0)
-     return false;
- 
--  for (int offset = 0; offset < max_offset; offset++) {
-+  for (int offset = 0; offset < _max_offset; offset++) {
-     const uint8_t* cur_buf = &es[offset];
-     if (cur_buf[0] != 0xff)
-       continue;
-@@ -155,7 +155,7 @@
-     return true;
-   }
- 
--  es_queue_->Pop(max_offset);
-+  es_queue_->Pop(_max_offset);
-   return false;
- }
- 
diff --git a/www/chromium/files/patch-media__media.gyp b/www/chromium/files/patch-media__media.gyp
deleted file mode 100644
index c51410d3fec1..000000000000
--- a/www/chromium/files/patch-media__media.gyp
+++ /dev/null
@@ -1,33 +0,0 @@
---- media/media.gyp.orig	2015-12-04 22:55:01.017572000 +0100
-+++ media/media.gyp	2015-12-04 22:58:02.692056000 +0100
-@@ -782,13 +782,19 @@
-             ['exclude', '_alsa\\.(h|cc)$'],
-           ],
-         }],
--        ['OS=="openbsd"', {
-+        ['OS=="freebsd"', {
-+          'sources!': [
-+            'capture/video/linux/v4l2_capture_delegate.cc',
-+            'capture/video/linux/video_capture_device_factory_linux.cc',
-+          ],
-+        }],
-+        ['OS=="openbsd" or OS=="freebsd"', {
-           'sources!': [
-             'capture/video/linux/v4l2_capture_delegate_multi_plane.cc',
-             'capture/video/linux/v4l2_capture_delegate_multi_plane.h',
-           ],
-         }],
--        ['OS=="linux"', {
-+        ['OS=="linux" or os_bsd==1', {
-           'conditions': [
-             ['use_x11==1', {
-               'dependencies': [
-@@ -1124,7 +1130,7 @@
-             'base/simd/filter_yuv_sse2.cc',
-           ],
-         }],
--        ['OS!="linux" and OS!="win"', {
-+        ['OS!="linux" and OS!="win" and os_bsd!=1', {
-           'sources!': [
-             'base/keyboard_event_counter.cc',
-             'base/keyboard_event_counter.h',
diff --git a/www/chromium/files/patch-media_audio_audio__manager.cc b/www/chromium/files/patch-media_audio_audio__manager.cc
new file mode 100644
index 000000000000..1d839e627075
--- /dev/null
+++ b/www/chromium/files/patch-media_audio_audio__manager.cc
@@ -0,0 +1,29 @@
+--- media/audio/audio_manager.cc.orig	2016-05-11 19:02:23 UTC
++++ media/audio/audio_manager.cc
+@@ -193,7 +193,7 @@ class AudioManagerHelper : public base::
+   }
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   void set_app_name(const std::string& app_name) {
+     app_name_ = app_name;
+   }
+@@ -243,7 +243,7 @@ class AudioManagerHelper : public base::
+   scoped_ptr<base::win::ScopedCOMInitializer> com_initializer_for_testing_;
+ #endif
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   std::string app_name_;
+ #endif
+ 
+@@ -321,7 +321,7 @@ void AudioManager::EnableCrashKeyLogging
+   g_helper.Pointer()->enable_crash_key_logging();
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // static
+ void AudioManager::SetGlobalAppName(const std::string& app_name) {
+   g_helper.Pointer()->set_app_name(app_name);
diff --git a/www/chromium/files/patch-media_audio_audio__manager.h b/www/chromium/files/patch-media_audio_audio__manager.h
new file mode 100644
index 000000000000..9ffa955e6f5a
--- /dev/null
+++ b/www/chromium/files/patch-media_audio_audio__manager.h
@@ -0,0 +1,11 @@
+--- media/audio/audio_manager.h.orig	2016-05-11 19:02:23 UTC
++++ media/audio/audio_manager.h
+@@ -68,7 +68,7 @@ class MEDIA_EXPORT AudioManager {
+   // See http://crbug.com/422522
+   static void EnableCrashKeyLoggingForAudioThreadHangs();
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+   // Sets the name of the audio source as seen by external apps. Only actually
+   // used with PulseAudio as of this writing.
+   static void SetGlobalAppName(const std::string& app_name);
diff --git a/www/chromium/files/patch-media_base_audio__splicer.cc b/www/chromium/files/patch-media_base_audio__splicer.cc
new file mode 100644
index 000000000000..5353fd742fbb
--- /dev/null
+++ b/www/chromium/files/patch-media_base_audio__splicer.cc
@@ -0,0 +1,20 @@
+--- media/base/audio_splicer.cc.orig	2016-05-11 19:02:23 UTC
++++ media/base/audio_splicer.cc
+@@ -167,7 +167,7 @@ bool AudioStreamSanitizer::AddInput(cons
+       output_timestamp_helper_.GetTimestamp();
+   const base::TimeDelta delta = timestamp - expected_timestamp;
+ 
+-  if (std::abs(delta.InMilliseconds()) >
++  if (std::labs(delta.InMilliseconds()) >
+       AudioSplicer::kMaxTimeDeltaInMilliseconds) {
+     MEDIA_LOG(ERROR, media_log_)
+         << "Audio splicing failed: coded frame timestamp differs from "
+@@ -183,7 +183,7 @@ bool AudioStreamSanitizer::AddInput(cons
+   if (delta != base::TimeDelta())
+     frames_to_fill = output_timestamp_helper_.GetFramesToTarget(timestamp);
+ 
+-  if (frames_to_fill == 0 || std::abs(frames_to_fill) < kMinGapSize) {
++  if (frames_to_fill == 0 || std::labs(frames_to_fill) < kMinGapSize) {
+     AddOutputBuffer(input);
+     return true;
+   }
diff --git a/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
new file mode 100644
index 000000000000..1d14f7164790
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_fake__video__capture__device__factory.cc
@@ -0,0 +1,11 @@
+--- media/capture/video/fake_video_capture_device_factory.cc.orig	2016-05-11 19:02:23 UTC
++++ media/capture/video/fake_video_capture_device_factory.cc
+@@ -49,7 +49,7 @@ void FakeVideoCaptureDeviceFactory::GetD
+   for (int n = 0; n < number_of_devices_; ++n) {
+     VideoCaptureDevice::Name name(base::StringPrintf("fake_device_%d", n),
+                                   base::StringPrintf("/dev/video%d", n)
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+                                       ,
+                                   VideoCaptureDevice::Name::V4L2_SINGLE_PLANE
+ #elif defined(OS_MACOSX)
diff --git a/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
new file mode 100644
index 000000000000..6433055a8b44
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_file__video__capture__device__factory.cc
@@ -0,0 +1,11 @@
+--- media/capture/video/file_video_capture_device_factory.cc.orig	2016-05-11 19:02:23 UTC
++++ media/capture/video/file_video_capture_device_factory.cc
+@@ -50,7 +50,7 @@ void FileVideoCaptureDeviceFactory::GetD
+   device_names->push_back(VideoCaptureDevice::Name(
+       command_line_file_path.value(), kFileVideoCaptureDeviceName,
+       VideoCaptureDevice::Name::AVFOUNDATION));
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   device_names->push_back(VideoCaptureDevice::Name(
+       command_line_file_path.value(), kFileVideoCaptureDeviceName,
+       VideoCaptureDevice::Name::V4L2_SINGLE_PLANE));
diff --git a/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
new file mode 100644
index 000000000000..4a662aeb8da0
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_linux_video__capture__device__linux.cc
@@ -0,0 +1,62 @@
+--- media/capture/video/linux/video_capture_device_linux.cc.orig	2016-05-11 19:02:23 UTC
++++ media/capture/video/linux/video_capture_device_linux.cc
+@@ -44,6 +44,7 @@ static bool ReadIdFile(const std::string
+   return true;
+ }
+ 
++#if !defined(OS_FREEBSD)
+ // Translates Video4Linux pixel formats to Chromium pixel formats.
+ // static
+ VideoPixelFormat VideoCaptureDeviceLinux::V4l2FourCcToChromiumPixelFormat(
+@@ -57,6 +58,7 @@ std::list<uint32_t> VideoCaptureDeviceLi
+     bool favour_mjpeg) {
+   return V4L2CaptureDelegate::GetListOfUsableFourCcs(favour_mjpeg);
+ }
++#endif // !defined(OS_FREEBSD)
+ 
+ const std::string VideoCaptureDevice::Name::GetModel() const {
+   // |unique_id| is of the form "/dev/video2".  |file_name| is "video2".
+@@ -90,6 +92,7 @@ VideoCaptureDeviceLinux::~VideoCaptureDe
+   v4l2_thread_.Stop();
+ }
+ 
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::AllocateAndStart(
+     const VideoCaptureParams& params,
+     scoped_ptr<VideoCaptureDevice::Client> client) {
+@@ -113,7 +116,13 @@ void VideoCaptureDeviceLinux::AllocateAn
+                  params.requested_format.frame_size.height(),
+                  params.requested_format.frame_rate, base::Passed(&client)));
+ }
++#else // !defined(OS_FREEBSD)
++void VideoCaptureDeviceLinux::AllocateAndStart(
++    const VideoCaptureParams& params,
++    scoped_ptr<VideoCaptureDevice::Client> client) {}
++#endif // !defined(OS_FREEBSD)
+ 
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::StopAndDeAllocate() {
+   if (!v4l2_thread_.IsRunning())
+     return;  // Wrong state.
+@@ -124,7 +133,11 @@ void VideoCaptureDeviceLinux::StopAndDeA
+ 
+   capture_impl_ = NULL;
+ }
++#else // !defined(OS_FREEBSD)
++void VideoCaptureDeviceLinux::StopAndDeAllocate() {}
++#endif // !defined(OS_FREEBSD)
+ 
++#if !defined(OS_FREEBSD)
+ void VideoCaptureDeviceLinux::SetRotation(int rotation) {
+   if (v4l2_thread_.IsRunning()) {
+     v4l2_thread_.message_loop()->PostTask(
+@@ -132,6 +145,9 @@ void VideoCaptureDeviceLinux::SetRotatio
+         base::Bind(&V4L2CaptureDelegate::SetRotation, capture_impl_, rotation));
+   }
+ }
++#else // !defined(OS_FREEBSD)
++void VideoCaptureDeviceLinux::SetRotation(int rotation) {}
++#endif // !defined(OS_FREEBSD)
+ 
+ // static
+ int VideoCaptureDeviceLinux::TranslatePowerLineFrequencyToV4L2(
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device.cc b/www/chromium/files/patch-media_capture_video_video__capture__device.cc
new file mode 100644
index 000000000000..08e1f2b78c65
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device.cc
@@ -0,0 +1,31 @@
+--- media/capture/video/video_capture_device.cc.orig	2016-05-11 19:02:23 UTC
++++ media/capture/video/video_capture_device.cc
+@@ -13,6 +13,10 @@
+ 
+ namespace media {
+ 
++const std::string VideoCaptureDevice::Name::GetModel() const {
++  return "";
++}
++
+ // TODO(msu.koo): http://crbug.com/532272, remove checking the switch in favour
+ // of deferring GetModel() call to the actual VideoCaptureDevice object.
+ const std::string VideoCaptureDevice::Name::GetNameAndModel() const {
+@@ -35,7 +39,7 @@ VideoCaptureDevice::Name::Name(const std
+     : device_name_(name), unique_id_(id) {
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ VideoCaptureDevice::Name::Name(const std::string& name,
+                                const std::string& id,
+                                const CaptureApiType api_type)
+@@ -82,7 +86,7 @@ VideoCaptureDevice::Name::Name(const std
+ VideoCaptureDevice::Name::~Name() {
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ const char* VideoCaptureDevice::Name::GetCaptureApiTypeString() const {
+   switch (capture_api_type()) {
+     case V4L2_SINGLE_PLANE:
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device.h b/www/chromium/files/patch-media_capture_video_video__capture__device.h
new file mode 100644
index 000000000000..4eff99efb46c
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device.h
@@ -0,0 +1,38 @@
+--- media/capture/video/video_capture_device.h.orig	2016-05-11 19:02:23 UTC
++++ media/capture/video/video_capture_device.h
+@@ -51,7 +51,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+     Name();
+     Name(const std::string& name, const std::string& id);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     // Linux/CrOS targets Capture Api type: it can only be set on construction.
+     enum CaptureApiType {
+       V4L2_SINGLE_PLANE,
+@@ -82,7 +82,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+ #endif
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+-    defined(OS_ANDROID)
++    defined(OS_ANDROID) || defined(OS_BSD)
+     Name(const std::string& name,
+          const std::string& id,
+          const CaptureApiType api_type);
+@@ -119,7 +119,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+     bool operator<(const Name& other) const { return unique_id_ < other.id(); }
+ 
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+-    defined(OS_ANDROID)
++    defined(OS_ANDROID) || defined(OS_BSD)
+     CaptureApiType capture_api_type() const {
+       return capture_api_class_.capture_api_type();
+     }
+@@ -143,7 +143,7 @@ class MEDIA_EXPORT VideoCaptureDevice {
+     std::string device_name_;
+     std::string unique_id_;
+ #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \
+-    defined(OS_ANDROID)
++    defined(OS_ANDROID) || defined(OS_BSD)
+     // This class wraps the CaptureApiType to give it a by default value if not
+     // initialized.
+     class CaptureApiClass {
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
new file mode 100644
index 000000000000..96b3f3d1a77a
--- /dev/null
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__factory.cc
@@ -0,0 +1,21 @@
+--- media/capture/video/video_capture_device_factory.cc.orig	2016-05-11 19:02:23 UTC
++++ media/capture/video/video_capture_device_factory.cc
+@@ -17,6 +17,10 @@ namespace media {
+ // static
+ scoped_ptr<VideoCaptureDeviceFactory> VideoCaptureDeviceFactory::CreateFactory(
+     scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
++#if defined(OS_BSD)
++  return scoped_ptr<VideoCaptureDeviceFactory>(new
++      media::FakeVideoCaptureDeviceFactory());
++#else
+   const base::CommandLine* command_line =
+       base::CommandLine::ForCurrentProcess();
+   // Use a Fake or File Video Device Factory if the command line flags are
+@@ -35,6 +39,7 @@ scoped_ptr<VideoCaptureDeviceFactory> Vi
+     return scoped_ptr<VideoCaptureDeviceFactory>(
+         CreateVideoCaptureDeviceFactory(ui_task_runner));
+   }
++#endif
+ }
+ 
+ VideoCaptureDeviceFactory::VideoCaptureDeviceFactory() {
diff --git a/www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc b/www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc
new file mode 100644
index 000000000000..8db3560b49e8
--- /dev/null
+++ b/www/chromium/files/patch-media_filters_decrypting__audio__decoder.cc
@@ -0,0 +1,11 @@
+--- media/filters/decrypting_audio_decoder.cc.orig	2016-05-11 19:02:24 UTC
++++ media/filters/decrypting_audio_decoder.cc
+@@ -29,7 +29,7 @@ static inline bool IsOutOfSync(const bas
+   // Out of sync of 100ms would be pretty noticeable and we should keep any
+   // drift below that.
+   const int64_t kOutOfSyncThresholdInMilliseconds = 100;
+-  return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
++  return std::labs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
+          kOutOfSyncThresholdInMilliseconds;
+ }
+ 
diff --git a/www/chromium/files/patch-media_filters_vp9__parser.h b/www/chromium/files/patch-media_filters_vp9__parser.h
new file mode 100644
index 000000000000..32276cb448e8
--- /dev/null
+++ b/www/chromium/files/patch-media_filters_vp9__parser.h
@@ -0,0 +1,10 @@
+--- media/filters/vp9_parser.h.orig	2016-05-25 15:01:03.000000000 -0400
++++ media/filters/vp9_parser.h	2016-05-27 11:13:20.498371000 -0400
+@@ -14,6 +14,7 @@
+ 
+ #include <stddef.h>
+ #include <stdint.h>
++#include <unistd.h>
+ #include <sys/types.h>
+ 
+ #include <deque>
diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
new file mode 100644
index 000000000000..58595e8d4011
--- /dev/null
+++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.cc
@@ -0,0 +1,20 @@
+--- media/formats/common/offset_byte_queue.cc.orig	2016-03-25 13:04:49 UTC
++++ media/formats/common/offset_byte_queue.cc
+@@ -46,13 +46,13 @@ void OffsetByteQueue::PeekAt(int64_t off
+   *size = tail() - offset;
+ }
+ 
+-bool OffsetByteQueue::Trim(int64_t max_offset) {
+-  if (max_offset < head_) return true;
+-  if (max_offset > tail()) {
++bool OffsetByteQueue::Trim(int64_t _max_offset) {
++  if (_max_offset < head_) return true;
++  if (_max_offset > tail()) {
+     Pop(size_);
+     return false;
+   }
+-  Pop(max_offset - head_);
++  Pop(_max_offset - head_);
+   return true;
+ }
+ 
diff --git a/www/chromium/files/patch-media_formats_common_offset__byte__queue.h b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h
new file mode 100644
index 000000000000..4f5847cd315d
--- /dev/null
+++ b/www/chromium/files/patch-media_formats_common_offset__byte__queue.h
@@ -0,0 +1,22 @@
+--- media/formats/common/offset_byte_queue.h.orig	2016-03-25 13:04:49 UTC
++++ media/formats/common/offset_byte_queue.h
+@@ -36,15 +36,15 @@ class MEDIA_EXPORT OffsetByteQueue {
+   // a null |buf| and a |size| of zero.
+   void PeekAt(int64_t offset, const uint8_t** buf, int* size);
+ 
+-  // Marks the bytes up to (but not including) |max_offset| as ready for
++  // Marks the bytes up to (but not including) |_max_offset| as ready for
+   // deletion. This is relatively inexpensive, but will not necessarily reduce
+   // the resident buffer size right away (or ever).
+   //
+   // Returns true if the full range of bytes were successfully trimmed,
+-  // including the case where |max_offset| is less than the current head.
+-  // Returns false if |max_offset| > tail() (although all bytes currently
++  // including the case where |_max_offset| is less than the current head.
++  // Returns false if |_max_offset| > tail() (although all bytes currently
+   // buffered are still cleared).
+-  bool Trim(int64_t max_offset);
++  bool Trim(int64_t _max_offset);
+ 
+   // The head and tail positions, in terms of the file's absolute offsets.
+   // tail() is an exclusive bound.
diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
new file mode 100644
index 000000000000..960e2b52c490
--- /dev/null
+++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__adts.cc
@@ -0,0 +1,26 @@
+--- media/formats/mp2t/es_parser_adts.cc.orig	2016-05-11 19:02:24 UTC
++++ media/formats/mp2t/es_parser_adts.cc
+@@ -62,11 +62,11 @@ bool EsParserAdts::LookForAdtsFrame(Adts
+   const uint8_t* es;
+   es_queue_->Peek(&es, &es_size);
+ 
+-  int max_offset = es_size - kADTSHeaderMinSize;
+-  if (max_offset <= 0)
++  int _max_offset = es_size - kADTSHeaderMinSize;
++  if (_max_offset <= 0)
+     return false;
+ 
+-  for (int offset = 0; offset < max_offset; offset++) {
++  for (int offset = 0; offset < _max_offset; offset++) {
+     const uint8_t* cur_buf = &es[offset];
+     if (!isAdtsSyncWord(cur_buf))
+       continue;
+@@ -104,7 +104,7 @@ bool EsParserAdts::LookForAdtsFrame(Adts
+     return true;
+   }
+ 
+-  es_queue_->Pop(max_offset);
++  es_queue_->Pop(_max_offset);
+   return false;
+ }
+ 
diff --git a/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
new file mode 100644
index 000000000000..bd5a0a3c2792
--- /dev/null
+++ b/www/chromium/files/patch-media_formats_mp2t_es__parser__mpeg1audio.cc
@@ -0,0 +1,26 @@
+--- media/formats/mp2t/es_parser_mpeg1audio.cc.orig	2016-05-11 19:02:24 UTC
++++ media/formats/mp2t/es_parser_mpeg1audio.cc
+@@ -110,11 +110,11 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
+   const uint8_t* es;
+   es_queue_->Peek(&es, &es_size);
+ 
+-  int max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
+-  if (max_offset <= 0)
++  int _max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
++  if (_max_offset <= 0)
+     return false;
+ 
+-  for (int offset = 0; offset < max_offset; offset++) {
++  for (int offset = 0; offset < _max_offset; offset++) {
+     const uint8_t* cur_buf = &es[offset];
+     if (cur_buf[0] != 0xff)
+       continue;
+@@ -155,7 +155,7 @@ bool EsParserMpeg1Audio::LookForMpeg1Aud
+     return true;
+   }
+ 
+-  es_queue_->Pop(max_offset);
++  es_queue_->Pop(_max_offset);
+   return false;
+ }
+ 
diff --git a/www/chromium/files/patch-media_media.gyp b/www/chromium/files/patch-media_media.gyp
new file mode 100644
index 000000000000..9650e2b4f95c
--- /dev/null
+++ b/www/chromium/files/patch-media_media.gyp
@@ -0,0 +1,26 @@
+--- media/media.gyp.orig	2016-05-11 19:02:24 UTC
++++ media/media.gyp
+@@ -745,7 +745,13 @@
+             ['exclude', '_alsa\\.(h|cc)$'],
+           ],
+         }],
+-        ['OS=="linux"', {
++	['OS=="freebsd"', {
++	  'sources!': [
++	    'capture/video/linux/v4l2_capture_delegate.cc',
++	    'capture/video/linux/video_capture_device_factory_linux.cc',
++	  ],
++	}],
++        ['OS=="linux" or os_bsd==1', {
+           'conditions': [
+             ['use_x11==1', {
+               'dependencies': [
+@@ -1095,7 +1101,7 @@
+             'base/simd/filter_yuv_sse2.cc',
+           ],
+         }],
+-        ['OS!="linux" and OS!="win"', {
++        ['OS!="linux" and OS!="win" and os_bsd!=1', {
+           'sources!': [
+             'base/keyboard_event_counter.cc',
+             'base/keyboard_event_counter.h',
diff --git a/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc b/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc
new file mode 100644
index 000000000000..0ae943eba5bc
--- /dev/null
+++ b/www/chromium/files/patch-mojo_shell_public_cpp_initialize__base__and__icu.cc
@@ -0,0 +1,16 @@
+--- mojo/shell/public/cpp/initialize_base_and_icu.cc.orig	2016-05-21 17:21:25 UTC
++++ mojo/shell/public/cpp/initialize_base_and_icu.cc
+@@ -33,11 +33,13 @@ InitializeBase(const uint8_t* icu_data) 
+   base::SysInfo::MaxSharedMemorySize();
+ #endif
+ 
++#if !defined(OS_FREEBSD) 
+   // Initialize core ICU. We must perform the full initialization before we
+   // initialize icu::TimeZone subsystem because otherwise ICU gets in a state
+   // where the timezone data is disconnected from the locale data which can
+   // cause crashes.
+   CHECK(base::i18n::InitializeICUFromRawMemory(icu_data));
++#endif
+ 
+ #if !defined(OS_ANDROID)
+   // ICU DateFormat class (used in base/time_format.cc) needs to get the
diff --git a/www/chromium/files/patch-mojo_shell_runner_init.cc b/www/chromium/files/patch-mojo_shell_runner_init.cc
new file mode 100644
index 000000000000..ee3f62f2c8d9
--- /dev/null
+++ b/www/chromium/files/patch-mojo_shell_runner_init.cc
@@ -0,0 +1,19 @@
+--- mojo/shell/runner/init.cc.orig	2016-05-21 17:23:12 UTC
++++ mojo/shell/runner/init.cc
+@@ -68,6 +68,8 @@ void WaitForDebuggerIfNecessary() {
+ 
+ void CallLibraryEarlyInitialization(base::NativeLibrary app_library) {
+   // Do whatever warming that the mojo application wants.
++
++#if !defined(OS_FREEBSD) 
+   typedef void (*LibraryEarlyInitFunction)(const uint8_t*);
+   LibraryEarlyInitFunction init_function =
+       reinterpret_cast<LibraryEarlyInitFunction>(
+@@ -79,6 +81,7 @@ void CallLibraryEarlyInitialization(base
+     const uint8_t* icu_data = base::i18n::GetRawIcuMemory();
+     init_function(icu_data);
+   }
++#endif
+ 
+   // TODO(erg): All chromium binaries load base. We might want to make a
+   // general system for other people.
diff --git a/www/chromium/files/patch-native__client_build_common.gypi b/www/chromium/files/patch-native__client_build_common.gypi
new file mode 100644
index 000000000000..d50a9951bf64
--- /dev/null
+++ b/www/chromium/files/patch-native__client_build_common.gypi
@@ -0,0 +1,11 @@
+--- native_client/build/common.gypi.orig	2016-05-11 19:03:08 UTC
++++ native_client/build/common.gypi
+@@ -58,7 +58,7 @@
+     ],
+   },
+   'conditions': [
+-    ['OS=="linux" or OS=="android"', {
++    ['OS=="linux" or OS=="android" or OS=="freebsd"', {
+       'target_defaults': {
+         'defines': [
+           '_POSIX_C_SOURCE=199506',
diff --git a/www/chromium/files/patch-native__client_src_shared_platform_platform.gyp b/www/chromium/files/patch-native__client_src_shared_platform_platform.gyp
new file mode 100644
index 000000000000..a2ada9987b9d
--- /dev/null
+++ b/www/chromium/files/patch-native__client_src_shared_platform_platform.gyp
@@ -0,0 +1,11 @@
+--- native_client/src/shared/platform/platform.gyp.orig	2016-05-11 19:03:08 UTC
++++ native_client/src/shared/platform/platform.gyp
+@@ -36,7 +36,7 @@
+       'refcount_base.cc',
+     ],
+     'conditions': [
+-      ['OS=="linux" or OS=="android"', {
++      ['OS=="linux" or OS=="android" or OS=="freebsd"', {
+         'platform_sources': [
+           'linux/nacl_clock.c',
+           'linux/nacl_host_dir.c',
diff --git a/www/chromium/files/patch-native_client__build__common.gypi b/www/chromium/files/patch-native_client__build__common.gypi
deleted file mode 100644
index 71ff9c8361cf..000000000000
--- a/www/chromium/files/patch-native_client__build__common.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
---- native_client/build/common.gypi.orig	2016-01-14 01:27:44.000000000 +0100
-+++ native_client/build/common.gypi	2016-01-21 16:23:12.810024295 +0100
-@@ -275,7 +275,7 @@
-     ],
-   },
-   'conditions': [
--    ['OS=="linux" or OS=="android"', {
-+    ['OS=="linux" or OS=="android" or OS=="freebsd"', {
-       'target_defaults': {
-         # Enable -Werror by default, but put it in a variable so it can
-         # be disabled in ~/.gyp/include.gypi on the valgrind builders.
diff --git a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp b/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
deleted file mode 100644
index a708c944b87e..000000000000
--- a/www/chromium/files/patch-native_client__src__shared__platform__platform.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- native_client/src/shared/platform/platform.gyp.orig	2014-10-10 09:16:25 UTC
-+++ native_client/src/shared/platform/platform.gyp
-@@ -36,7 +36,7 @@
-       'refcount_base.cc',
-     ],
-     'conditions': [
--      ['OS=="linux" or OS=="android"', {
-+      ['OS=="linux" or OS=="android" or OS=="freebsd"', {
-         'platform_sources': [
-           'linux/nacl_clock.c',
-           'linux/nacl_host_dir.c',
diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.cc b/www/chromium/files/patch-net__base__address_tracker_linux.cc
deleted file mode 100644
index 24ea66736bd6..000000000000
--- a/www/chromium/files/patch-net__base__address_tracker_linux.cc
+++ /dev/null
@@ -1,94 +0,0 @@
---- net/base/address_tracker_linux.cc.orig	2015-08-22 15:01:56.000000000 -0400
-+++ net/base/address_tracker_linux.cc	2015-09-03 10:45:50.411703000 -0400
-@@ -5,7 +5,9 @@
- #include "net/base/address_tracker_linux.h"
- 
- #include <errno.h>
-+#if !defined(OS_FREEBSD)
- #include <linux/if.h>
-+#endif
- #include <sys/ioctl.h>
- 
- #include "base/files/scoped_file.h"
-@@ -39,6 +41,7 @@
- bool GetAddress(const struct nlmsghdr* header,
-                 IPAddressNumber* out,
-                 bool* really_deprecated) {
-+#if !defined(OS_FREEBSD)
-   if (really_deprecated)
-     *really_deprecated = false;
-   const struct ifaddrmsg* msg =
-@@ -91,6 +94,9 @@
-     return false;
-   out->assign(address, address + address_length);
-   return true;
-+#else
-+  return false;
-+#endif
- }
- 
- }  // namespace
-@@ -146,6 +152,7 @@
- }
- 
- void AddressTrackerLinux::Init() {
-+#if !defined(OS_FREEBSD)
-   netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
-   if (netlink_fd_ < 0) {
-     PLOG(ERROR) << "Could not create NETLINK socket";
-@@ -233,6 +240,10 @@
-       return;
-     }
-   }
-+#else
-+  AbortAndForceOnline();
-+  return;
-+#endif
- }
- 
- void AddressTrackerLinux::AbortAndForceOnline() {
-@@ -277,6 +288,7 @@
- void AddressTrackerLinux::ReadMessages(bool* address_changed,
-                                        bool* link_changed,
-                                        bool* tunnel_changed) {
-+#if !defined(OS_FREEBSD)
-   *address_changed = false;
-   *link_changed = false;
-   *tunnel_changed = false;
-@@ -303,6 +315,7 @@
-   }
-   if (*link_changed || *address_changed)
-     UpdateCurrentConnectionType();
-+#endif
- }
- 
- void AddressTrackerLinux::HandleMessage(char* buffer,
-@@ -310,6 +323,7 @@
-                                         bool* address_changed,
-                                         bool* link_changed,
-                                         bool* tunnel_changed) {
-+#if !defined(OS_FREEBSD)
-   DCHECK(buffer);
-   for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
-        NLMSG_OK(header, length);
-@@ -406,6 +420,7 @@
-         break;
-     }
-   }
-+#endif
- }
- 
- void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
-@@ -432,8 +447,12 @@
- 
- bool AddressTrackerLinux::IsTunnelInterface(int interface_index) const {
-   // Linux kernel drivers/net/tun.c uses "tun" name prefix.
-+#if !defined(OS_FREEBSD)
-   char buf[IFNAMSIZ] = {0};
-   return strncmp(get_interface_name_(interface_index, buf), "tun", 3) == 0;
-+#else
-+  return false;
-+#endif
- }
- 
- void AddressTrackerLinux::UpdateCurrentConnectionType() {
diff --git a/www/chromium/files/patch-net__base__address_tracker_linux.h b/www/chromium/files/patch-net__base__address_tracker_linux.h
deleted file mode 100644
index e811fac5d6d3..000000000000
--- a/www/chromium/files/patch-net__base__address_tracker_linux.h
+++ /dev/null
@@ -1,27 +0,0 @@
---- net/base/address_tracker_linux.h.orig	2016-03-04 23:14:54.569478409 +0100
-+++ net/base/address_tracker_linux.h	2016-03-04 23:15:49.769474661 +0100
-@@ -6,10 +6,12 @@
- #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
- 
- #include <sys/socket.h>  // Needed to include netlink.
-+#if !defined(OS_FREEBSD)
- // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
- #define net net_kernel
- #include <linux/rtnetlink.h>
- #undef net
-+#endif
- #include <stddef.h>
- 
- #include <map>
-@@ -33,7 +35,11 @@
- class NET_EXPORT_PRIVATE AddressTrackerLinux :
-     public base::MessageLoopForIO::Watcher {
-  public:
-+#if !defined(OS_FREEBSD)
-   typedef std::map<IPAddressNumber, struct ifaddrmsg> AddressMap;
-+#else
-+  typedef void* AddressMap;
-+#endif
- 
-   // Non-tracking version constructor: it takes a snapshot of the
-   // current system configuration. Once Init() returns, the
diff --git a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc b/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
deleted file mode 100644
index acebe7025116..000000000000
--- a/www/chromium/files/patch-net__base__address_tracker_linux_unittest.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- net/base/address_tracker_linux_unittest.cc.orig	2014-10-10 08:54:16 UTC
-+++ net/base/address_tracker_linux_unittest.cc
-@@ -5,7 +5,11 @@
- #include "base/memory/scoped_ptr.h"
- #include "net/base/address_tracker_linux.h"
- 
-+#if defined(__linux__)
- #include <linux/if.h>
-+#else
-+#include <net/if.h>
-+#endif
- 
- #include <vector>
- 
diff --git a/www/chromium/files/patch-net__base__mime_util_unittest.cc b/www/chromium/files/patch-net__base__mime_util_unittest.cc
deleted file mode 100644
index d950490d6cf6..000000000000
--- a/www/chromium/files/patch-net__base__mime_util_unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/base/mime_util_unittest.cc.orig	2015-09-26 19:23:37.646612000 +0200
-+++ net/base/mime_util_unittest.cc	2015-09-26 19:24:04.566580000 +0200
-@@ -242,7 +242,7 @@
-     { "MeSsAge/*",  1, "eml" },
-     { "image/bmp",  1, "bmp" },
-     { "video/*",    6, "mp4" },
--#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS)
-+#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS)
-     { "video/*",    6, "mpg" },
- #else
-     { "video/*",    6, "mpeg" },
diff --git a/www/chromium/files/patch-net__base__network_change_notifier.cc b/www/chromium/files/patch-net__base__network_change_notifier.cc
deleted file mode 100644
index 6dd50247adcb..000000000000
--- a/www/chromium/files/patch-net__base__network_change_notifier.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/base/network_change_notifier.cc.orig	2014-10-10 09:15:31 UTC
-+++ net/base/network_change_notifier.cc
-@@ -521,7 +521,6 @@
- #elif defined(OS_MACOSX)
-   return new NetworkChangeNotifierMac();
- #else
--  NOTIMPLEMENTED();
-   return NULL;
- #endif
- }
diff --git a/www/chromium/files/patch-net__base__network_interfaces_linux.cc b/www/chromium/files/patch-net__base__network_interfaces_linux.cc
deleted file mode 100644
index aa14bd834c5c..000000000000
--- a/www/chromium/files/patch-net__base__network_interfaces_linux.cc
+++ /dev/null
@@ -1,105 +0,0 @@
---- net/base/network_interfaces_linux.cc.orig	2015-09-03 11:01:37.625073000 -0400
-+++ net/base/network_interfaces_linux.cc	2015-09-03 11:00:13.970733000 -0400
-@@ -4,12 +4,14 @@
- 
- #include "net/base/network_interfaces_linux.h"
- 
-+#if !defined(OS_FREEBSD)
- #if !defined(OS_ANDROID)
- #include <linux/ethtool.h>
- #endif  // !defined(OS_ANDROID)
- #include <linux/if.h>
- #include <linux/sockios.h>
- #include <linux/wireless.h>
-+#endif  // !defined(OS_FREEBSD)
- #include <set>
- #include <sys/ioctl.h>
- #include <sys/types.h>
-@@ -45,6 +47,7 @@
-   // are still progressing through duplicated address detection (DAD)
-   // and shouldn't be used by the application layer until DAD process
-   // is completed.
-+#if !defined(OS_FREEBSD)
-   if (native_attributes & (
- #if !defined(OS_ANDROID)
-                               IFA_F_OPTIMISTIC | IFA_F_DADFAILED |
-@@ -62,6 +65,10 @@
-   }
- 
-   return true;
-+#else
-+  // the flags tested above are not present on FreeBSD
-+  return false;
-+#endif  // !OS_FREEBSD
- }
- 
- }  // namespace
-@@ -80,13 +87,15 @@
-   if (!s.is_valid())
-     return NetworkChangeNotifier::CONNECTION_UNKNOWN;
- 
-+#if !defined(OS_FREEBSD)
-   // Test wireless extensions for CONNECTION_WIFI
-   struct iwreq pwrq = {};
-   strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
-   if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1)
-     return NetworkChangeNotifier::CONNECTION_WIFI;
-+#endif  // !defined(OS_FREEBSD)
- 
--#if !defined(OS_ANDROID)
-+#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
-   // Test ethtool for CONNECTION_ETHERNET
-   struct ethtool_cmd ecmd = {};
-   ecmd.cmd = ETHTOOL_GSET;
-@@ -95,12 +104,13 @@
-   strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
-   if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
-     return NetworkChangeNotifier::CONNECTION_ETHERNET;
--#endif  // !defined(OS_ANDROID)
-+#endif  // !defined(OS_ANDROID) && !defined(OS_FREEBSD)
- 
-   return NetworkChangeNotifier::CONNECTION_UNKNOWN;
- }
- 
- std::string GetInterfaceSSID(const std::string& ifname) {
-+#if !defined(OS_FREEBSD)
-   base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
-   if (!ioctl_socket.is_valid())
-     return "";
-@@ -112,9 +122,11 @@
-   wreq.u.essid.length = IW_ESSID_MAX_SIZE;
-   if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
-     return ssid;
-+#endif  // !defined(OS_FREEBSD)
-   return "";
- }
- 
-+#if !defined(OS_FREEBSD)
- bool GetNetworkListImpl(
-     NetworkInterfaceList* networks,
-     int policy,
-@@ -183,6 +195,7 @@
- 
-   return true;
- }
-+#endif  // !defined(OS_FREEBSD)
- 
- std::string GetWifiSSIDFromInterfaceListInternal(
-     const NetworkInterfaceList& interfaces,
-@@ -207,12 +220,16 @@
-   if (networks == NULL)
-     return false;
- 
-+#if !defined(OS_FREEBSD)
-   internal::AddressTrackerLinux tracker;
-   tracker.Init();
- 
-   return internal::GetNetworkListImpl(
-       networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(),
-       &internal::AddressTrackerLinux::GetInterfaceName);
-+#else
-+  return false;
-+#endif
- }
- 
- std::string GetWifiSSID() {
diff --git a/www/chromium/files/patch-net__base__network_interfaces_posix.cc b/www/chromium/files/patch-net__base__network_interfaces_posix.cc
deleted file mode 100644
index b6e942e4e9bd..000000000000
--- a/www/chromium/files/patch-net__base__network_interfaces_posix.cc
+++ /dev/null
@@ -1,18 +0,0 @@
---- net/base/network_interfaces_posix.cc.orig	2015-09-03 11:04:58.534429000 -0400
-+++ net/base/network_interfaces_posix.cc	2015-09-03 11:07:05.587031000 -0400
-@@ -20,6 +20,7 @@
- #if !defined(OS_NACL)
- namespace internal {
- 
-+#if !defined(OS_BSD)
- // The application layer can pass |policy| defined in net_util.h to
- // request filtering out certain type of interfaces.
- bool ShouldIgnoreInterface(const std::string& name, int policy) {
-@@ -33,6 +34,7 @@
- 
-   return false;
- }
-+#endif
- 
- // Check if the address is unspecified (i.e. made of zeroes) or loopback.
- bool IsLoopbackOrUnspecifiedAddress(const sockaddr* addr) {
diff --git a/www/chromium/files/patch-net__dns__address_sorter_posix.cc b/www/chromium/files/patch-net__dns__address_sorter_posix.cc
deleted file mode 100644
index aaea2f92427a..000000000000
--- a/www/chromium/files/patch-net__dns__address_sorter_posix.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- net/dns/address_sorter_posix.cc.orig	2014-10-10 08:54:16 UTC
-+++ net/dns/address_sorter_posix.cc
-@@ -10,6 +10,7 @@
- #include <sys/socket.h>  // Must be included before ifaddrs.h.
- #include <ifaddrs.h>
- #include <net/if.h>
-+#include <net/if_var.h>
- #include <netinet/in_var.h>
- #include <string.h>
- #include <sys/ioctl.h>
diff --git a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc b/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
deleted file mode 100644
index 2cdb15e2660d..000000000000
--- a/www/chromium/files/patch-net__dns__dns_config_service_posix_unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/dns/dns_config_service_posix_unittest.cc.orig	2015-07-15 16:30:05.000000000 -0400
-+++ net/dns/dns_config_service_posix_unittest.cc	2015-07-22 07:45:57.034816000 -0400
-@@ -2,8 +2,6 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
--#include <resolv.h>
--
- #include "base/cancelable_callback.h"
- #include "base/files/file_util.h"
- #include "base/sys_byteorder.h"
diff --git a/www/chromium/files/patch-net__dns__dns_reloader.cc b/www/chromium/files/patch-net__dns__dns_reloader.cc
deleted file mode 100644
index 56b15bd094fa..000000000000
--- a/www/chromium/files/patch-net__dns__dns_reloader.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- net/dns/dns_reloader.cc.orig	2016-01-21 16:39:42.984956172 +0100
-+++ net/dns/dns_reloader.cc	2016-01-21 16:40:30.288952815 +0100
-@@ -7,6 +7,10 @@
- #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-     !defined(OS_ANDROID)
- 
-+#if defined(OS_FREEBSD)
-+#include <netinet/in.h>
-+#endif
-+
- #include <resolv.h>
- 
- #include "base/basictypes.h"
diff --git a/www/chromium/files/patch-net__dns__dns_session.cc b/www/chromium/files/patch-net__dns__dns_session.cc
deleted file mode 100644
index 878b4ba3ec91..000000000000
--- a/www/chromium/files/patch-net__dns__dns_session.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/dns/dns_session.cc.orig	2014-10-10 08:54:16 UTC
-+++ net/dns/dns_session.cc
-@@ -178,7 +178,7 @@
-   base::TimeDelta current_error = rtt - estimate;
-   estimate += current_error / 8;  // * alpha
-   base::TimeDelta abs_error = base::TimeDelta::FromInternalValue(
--      std::abs(current_error.ToInternalValue()));
-+      std::labs(current_error.ToInternalValue()));
-   deviation += (abs_error - deviation) / 4;  // * delta
- 
-   // Histogram-based method.
diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
deleted file mode 100644
index a2072b7a8a13..000000000000
--- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- net/http/http_auth_gssapi_posix.cc.orig	2016-01-21 16:42:58.881942944 +0100
-+++ net/http/http_auth_gssapi_posix.cc	2016-01-21 16:43:28.081940938 +0100
-@@ -431,8 +431,8 @@
-     static const char* const kDefaultLibraryNames[] = {
- #if defined(OS_MACOSX)
-       "/System/Library/Frameworks/Kerberos.framework/Kerberos"
--#elif defined(OS_OPENBSD)
--      "libgssapi.so"          // Heimdal - OpenBSD
-+#elif defined(OS_BSD)
-+      "libgssapi.so"          // Heimdal - OpenBSD / FreeBSD
- #else
-       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
-       "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/www/chromium/files/patch-net__net.gyp b/www/chromium/files/patch-net__net.gyp
deleted file mode 100644
index 12fda87e6a61..000000000000
--- a/www/chromium/files/patch-net__net.gyp
+++ /dev/null
@@ -1,23 +0,0 @@
---- net/net.gyp.orig	2015-05-13 18:35:47.000000000 -0400
-+++ net/net.gyp         2015-05-20 16:09:23.255544000 -0400
-@@ -146,7 +146,7 @@
-         '<@(net_test_sources)',
-       ],
-       'conditions': [
--        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
-+        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
-           'dependencies': [
-             'epoll_quic_tools',
-             'epoll_server',
-@@ -659,6 +659,11 @@
-               'test/cert_test_util_nss.cc',
-             ],
-         }],
-+        [ 'os_bsd == 1', {
-+          'sources!': [
-+            'base/address_tracker_linux_unittest.cc',
-+          ],
-+        }],
-       ],
-       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-       'msvs_disabled_warnings': [4267, ],
diff --git a/www/chromium/files/patch-net__net.gypi b/www/chromium/files/patch-net__net.gypi
deleted file mode 100644
index 762d87e6c0bf..000000000000
--- a/www/chromium/files/patch-net__net.gypi
+++ /dev/null
@@ -1,22 +0,0 @@
---- net/net.gypi.orig	2015-12-04 22:59:49.506305000 +0100
-+++ net/net.gypi	2015-12-04 23:00:47.269128000 +0100
-@@ -392,8 +392,8 @@
-       'android/network_library.h',
-       'android/traffic_stats.cc',
-       'android/traffic_stats.h',
--      'base/address_tracker_linux.cc',
--      'base/address_tracker_linux.h',
-+#      'base/address_tracker_linux.cc',
-+#      'base/address_tracker_linux.h',
-       'base/backoff_entry.cc',
-       'base/backoff_entry.h',
-       'base/backoff_entry_serializer.cc',
-@@ -1245,7 +1245,7 @@
-       'android/network_change_notifier_android_unittest.cc',
-       'android/traffic_stats_unittest.cc',
-       'base/address_list_unittest.cc',
--      'base/address_tracker_linux_unittest.cc',
-+#      'base/address_tracker_linux_unittest.cc',
-       'base/backoff_entry_serializer_unittest.cc',
-       'base/backoff_entry_unittest.cc',
-       'base/chunked_upload_data_stream_unittest.cc',
diff --git a/www/chromium/files/patch-net__net_common.gypi b/www/chromium/files/patch-net__net_common.gypi
deleted file mode 100644
index 2c3ab72fbf4f..000000000000
--- a/www/chromium/files/patch-net__net_common.gypi
+++ /dev/null
@@ -1,14 +0,0 @@
---- net/net_common.gypi.orig	2015-05-20 16:10:47.668198000 -0400
-+++ net/net_common.gypi	2015-05-20 16:10:38.213855000 -0400
-@@ -246,9 +246,10 @@
-         'conditions': [
-           ['os_bsd==1', {
-             'sources!': [
-+              'base/address_tracker_linux.cc',
-               'base/network_change_notifier_linux.cc',
-               'base/network_change_notifier_netlink_linux.cc',
--              'proxy/proxy_config_service_linux.cc',
-+#              'proxy/proxy_config_service_linux.cc',
-             ],
-           },{
-             'dependencies': [
diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
deleted file mode 100644
index 983dab8d450c..000000000000
--- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc
+++ /dev/null
@@ -1,145 +0,0 @@
---- net/proxy/proxy_config_service_linux.cc.orig	2015-05-13 18:23:09.000000000 -0400
-+++ net/proxy/proxy_config_service_linux.cc         2015-05-20 16:54:28.541791000 -0400
-@@ -12,7 +12,14 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#if defined(OS_FREEBSD)
-+#include <fcntl.h>
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#else
- #include <sys/inotify.h>
-+#endif
- #include <unistd.h>
- 
- #include <map>
-@@ -859,6 +865,7 @@
-  public:
-   explicit SettingGetterImplKDE(base::Environment* env_var_getter)
-       : inotify_fd_(-1),
-+        config_fd_(-1),
-         notify_delegate_(NULL),
-         debounce_timer_(new base::OneShotTimer<SettingGetterImplKDE>()),
-         indirect_manual_(false),
-@@ -929,9 +936,10 @@
-     // and pending tasks may then be deleted without being run.
-     // Here in the KDE version, we can safely close the file descriptor
-     // anyway. (Not that it really matters; the process is exiting.)
--    if (inotify_fd_ >= 0)
-+    if (inotify_fd_ >= 0 || config_fd_ >= 0)
-       ShutDown();
-     DCHECK(inotify_fd_ < 0);
-+    DCHECK(config_fd_ < 0);
-   }
- 
-   bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
-@@ -944,9 +944,17 @@
-     // This has to be called on the UI thread (http://crbug.com/69057).
-     base::ThreadRestrictions::ScopedAllowIO allow_io;
-     DCHECK(inotify_fd_ < 0);
-+#if defined(OS_FREEBSD)
-+    inotify_fd_ = kqueue();
-+#else
-     inotify_fd_ = inotify_init();
-+#endif
-     if (inotify_fd_ < 0) {
-+#if defined(OS_FREEBSD)
-+      PLOG(ERROR) << "kqueue failed";
-+#else
-       PLOG(ERROR) << "inotify_init failed";
-+#endif
-       return false;
-     }
-     if (!base::SetNonBlocking(inotify_fd_)) {
-@@ -967,22 +985,40 @@
-       close(inotify_fd_);
-       inotify_fd_ = -1;
-     }
-+    if (config_fd_ >= 0) {
-+      close(config_fd_);
-+      config_fd_ = -1;
-+    }
-     debounce_timer_.reset();
-   }
- 
-   bool SetUpNotifications(
-       ProxyConfigServiceLinux::Delegate* delegate) override {
-     DCHECK(inotify_fd_ >= 0);
-+    DCHECK(config_fd_ >= 0);
-     DCHECK(file_task_runner_->BelongsToCurrentThread());
-     // We can't just watch the kioslaverc file directly, since KDE will write
-     // a new copy of it and then rename it whenever settings are changed and
-     // inotify watches inodes (so we'll be watching the old deleted file after
-     // the first change, and it will never change again). So, we watch the
-     // directory instead. We then act only on changes to the kioslaverc entry.
-+#if defined(OS_FREEBSD)
-+    config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY));
-+
-+    if (config_fd_ == -1)
-+      return false;
-+
-+    struct kevent ev;
-+    EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE,
-+            0, NULL);
-+    if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1)
-+      return false;
-+#else
-     if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(),
-                           IN_MODIFY | IN_MOVED_TO) < 0) {
-       return false;
-     }
-+#endif
-     notify_delegate_ = delegate;
-     if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
-             inotify_fd_, true, base::MessageLoopForIO::WATCH_READ,
-@@ -1003,7 +1039,19 @@
-   void OnFileCanReadWithoutBlocking(int fd) override {
-     DCHECK_EQ(fd, inotify_fd_);
-     DCHECK(file_task_runner_->BelongsToCurrentThread());
-+#if defined(OS_FREEBSD)
-+    struct kevent ev;
-+    int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL);
-+
-+    if (rv != -1 && (ev.flags & EV_ERROR) == 0) {
-+      OnChangeNotification();
-+    } else {
-+      LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!";
-+      ShutDown();
-+    }
-+#else
-     OnChangeNotification();
-+#endif
-   }
-   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
- 
-@@ -1276,8 +1324,11 @@
-   void OnChangeNotification() {
-     DCHECK_GE(inotify_fd_,  0);
-     DCHECK(file_task_runner_->BelongsToCurrentThread());
--    char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
-     bool kioslaverc_touched = false;
-+#if defined(OS_FREEBSD)
-+    kioslaverc_touched = true;
-+#else
-+    char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
-     ssize_t r;
-     while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
-       // inotify returns variable-length structures, which is why we have
-@@ -1314,6 +1365,7 @@
-         inotify_fd_ = -1;
-       }
-     }
-+#endif
-     if (kioslaverc_touched) {
-       // We don't use Reset() because the timer may not yet be running.
-       // (In that case Stop() is a no-op.)
-@@ -1329,6 +1381,7 @@
-                    std::vector<std::string> > strings_map_type;
- 
-   int inotify_fd_;
-+  int config_fd_;
-   base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
-   ProxyConfigServiceLinux::Delegate* notify_delegate_;
-   scoped_ptr<base::OneShotTimer<SettingGetterImplKDE> > debounce_timer_;
diff --git a/www/chromium/files/patch-net__proxy__proxy_service.cc b/www/chromium/files/patch-net__proxy__proxy_service.cc
deleted file mode 100644
index 8cff34fbc396..000000000000
--- a/www/chromium/files/patch-net__proxy__proxy_service.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- net/proxy/proxy_service.cc.orig	2015-12-04 23:02:25.675097000 +0100
-+++ net/proxy/proxy_service.cc	2015-12-04 23:04:16.821354000 +0100
-@@ -43,7 +43,7 @@
- #elif defined(OS_MACOSX)
- #include "net/proxy/proxy_config_service_mac.h"
- #include "net/proxy/proxy_resolver_mac.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- #include "net/proxy/proxy_config_service_linux.h"
- #elif defined(OS_ANDROID)
- #include "net/proxy/proxy_config_service_android.h"
-@@ -1507,7 +1507,7 @@
-              << "profile_io_data.cc::CreateProxyConfigService and this should "
-              << "be used only for examples.";
-   return make_scoped_ptr(new UnsetProxyConfigService);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_FREEBSD)
-   scoped_ptr<ProxyConfigServiceLinux> linux_config_service(
-       new ProxyConfigServiceLinux());
- 
diff --git a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc b/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
deleted file mode 100644
index 2501c5f25fa0..000000000000
--- a/www/chromium/files/patch-net__quic__congestion_control__rtt_stats.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- net/quic/congestion_control/rtt_stats.cc.orig	2016-03-05 11:59:07.038865734 +0100
-+++ net/quic/congestion_control/rtt_stats.cc	2016-03-05 11:59:48.890863022 +0100
-@@ -4,7 +4,7 @@
- 
- #include "net/quic/congestion_control/rtt_stats.h"
- 
--#include <cstdlib>  // std::abs
-+#include <cstdlib>  // std::labs
- 
- using std::max;
- 
-@@ -41,7 +41,7 @@
-   mean_deviation_ =
-       max(mean_deviation_,
-           QuicTime::Delta::FromMicroseconds(
--              std::abs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds())));
-+              std::labs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds())));
-   smoothed_rtt_ = max(smoothed_rtt_, latest_rtt_);
- }
- 
-@@ -81,7 +81,7 @@
-   } else {
-     mean_deviation_ = QuicTime::Delta::FromMicroseconds(static_cast<int64_t>(
-         kOneMinusBeta * mean_deviation_.ToMicroseconds() +
--        kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())));
-+        kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())));
-     smoothed_rtt_ =
-         smoothed_rtt_.Multiply(kOneMinusAlpha).Add(rtt_sample.Multiply(kAlpha));
-     DVLOG(1) << " smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
diff --git a/www/chromium/files/patch-net__socket__socks5_client_socket.cc b/www/chromium/files/patch-net__socket__socks5_client_socket.cc
deleted file mode 100644
index f39df0badaf5..000000000000
--- a/www/chromium/files/patch-net__socket__socks5_client_socket.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- net/socket/socks5_client_socket.cc.orig	2016-03-05 12:01:24.173856244 +0100
-+++ net/socket/socks5_client_socket.cc	2016-03-05 12:01:43.793854738 +0100
-@@ -4,6 +4,10 @@
- 
- #include "net/socket/socks5_client_socket.h"
- 
-+#if defined(OS_BSD)
-+#include <netinet/in.h>
-+#endif
-+
- #include <utility>
- 
- #include "base/callback_helpers.h"
diff --git a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc b/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
deleted file mode 100644
index ba500a24d2d2..000000000000
--- a/www/chromium/files/patch-net__udp__udp_socket_unittest.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/udp/udp_socket_unittest.cc.orig	2014-10-10 08:54:16 UTC
-+++ net/udp/udp_socket_unittest.cc
-@@ -204,7 +204,7 @@
-       client_entries, 5, NetLog::TYPE_SOCKET_ALIVE));
- }
- 
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // UDPSocketPrivate_Broadcast is disabled for OSX because it requires
- // root permissions on OSX 10.7+.
- TEST_F(UDPSocketTest, DISABLED_Broadcast) {
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.cc b/www/chromium/files/patch-net_base_address__tracker__linux.cc
new file mode 100644
index 000000000000..e870a3a9a963
--- /dev/null
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.cc
@@ -0,0 +1,94 @@
+--- net/base/address_tracker_linux.cc.orig	2016-05-25 15:01:03.000000000 -0400
++++ net/base/address_tracker_linux.cc	2016-05-27 11:16:09.919235000 -0400
+@@ -5,7 +5,9 @@
+ #include "net/base/address_tracker_linux.h"
+ 
+ #include <errno.h>
++#if !defined(OS_FREEBSD)
+ #include <linux/if.h>
++#endif
+ #include <stdint.h>
+ #include <sys/ioctl.h>
+ 
+@@ -39,6 +41,7 @@
+ bool GetAddress(const struct nlmsghdr* header,
+                 IPAddress* out,
+                 bool* really_deprecated) {
++#if !defined(OS_FREEBSD)
+   if (really_deprecated)
+     *really_deprecated = false;
+   const struct ifaddrmsg* msg =
+@@ -91,6 +94,9 @@
+     return false;
+   *out = IPAddress(address, address_length);
+   return true;
++#else
++  return false;
++#endif
+ }
+ 
+ }  // namespace
+@@ -148,6 +154,7 @@
+ }
+ 
+ void AddressTrackerLinux::Init() {
++#if !defined(OS_FREEBSD)
+   netlink_fd_ = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
+   if (netlink_fd_ < 0) {
+     PLOG(ERROR) << "Could not create NETLINK socket";
+@@ -235,6 +242,10 @@
+       return;
+     }
+   }
++#else
++  AbortAndForceOnline();
++  return;
++#endif
+ }
+ 
+ void AddressTrackerLinux::AbortAndForceOnline() {
+@@ -281,6 +292,7 @@
+ void AddressTrackerLinux::ReadMessages(bool* address_changed,
+                                        bool* link_changed,
+                                        bool* tunnel_changed) {
++#if !defined(OS_FREEBSD)
+   *address_changed = false;
+   *link_changed = false;
+   *tunnel_changed = false;
+@@ -307,6 +319,7 @@
+   }
+   if (*link_changed || *address_changed)
+     UpdateCurrentConnectionType();
++#endif
+ }
+ 
+ void AddressTrackerLinux::HandleMessage(char* buffer,
+@@ -314,6 +327,7 @@
+                                         bool* address_changed,
+                                         bool* link_changed,
+                                         bool* tunnel_changed) {
++#if !defined(OS_FREEBSD)
+   DCHECK(buffer);
+   for (struct nlmsghdr* header = reinterpret_cast<struct nlmsghdr*>(buffer);
+        NLMSG_OK(header, length);
+@@ -410,6 +424,7 @@
+         break;
+     }
+   }
++#endif
+ }
+ 
+ void AddressTrackerLinux::OnFileCanReadWithoutBlocking(int fd) {
+@@ -436,8 +451,12 @@
+ 
+ bool AddressTrackerLinux::IsTunnelInterface(int interface_index) const {
+   // Linux kernel drivers/net/tun.c uses "tun" name prefix.
++#if !defined(OS_FREEBSD)
+   char buf[IFNAMSIZ] = {0};
+   return strncmp(get_interface_name_(interface_index, buf), "tun", 3) == 0;
++#else
++  return false;
++#endif
+ }
+ 
+ void AddressTrackerLinux::UpdateCurrentConnectionType() {
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux.h b/www/chromium/files/patch-net_base_address__tracker__linux.h
new file mode 100644
index 000000000000..3ef11c4e032d
--- /dev/null
+++ b/www/chromium/files/patch-net_base_address__tracker__linux.h
@@ -0,0 +1,28 @@
+--- net/base/address_tracker_linux.h.orig	2016-05-25 15:01:03.000000000 -0400
++++ net/base/address_tracker_linux.h	2016-05-27 11:17:51.228810000 -0400
+@@ -6,10 +6,12 @@
+ #define NET_BASE_ADDRESS_TRACKER_LINUX_H_
+ 
+ #include <sys/socket.h>  // Needed to include netlink.
++#if !defined(OS_FREEBSD)
+ // Mask superfluous definition of |struct net|. This is fixed in Linux 2.6.38.
+ #define net net_kernel
+ #include <linux/rtnetlink.h>
+ #undef net
++#endif
+ #include <stddef.h>
+ 
+ #include <map>
+@@ -33,8 +35,11 @@
+ class NET_EXPORT_PRIVATE AddressTrackerLinux :
+     public base::MessageLoopForIO::Watcher {
+  public:
++#if !defined(OS_FREEBSD)
+   typedef std::map<IPAddress, struct ifaddrmsg> AddressMap;
+-
++#else
++  typedef void* AddressMap;
++#endif
+   // Non-tracking version constructor: it takes a snapshot of the
+   // current system configuration. Once Init() returns, the
+   // configuration is available through GetOnlineLinks() and
diff --git a/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
new file mode 100644
index 000000000000..9c4f6a61ecac
--- /dev/null
+++ b/www/chromium/files/patch-net_base_address__tracker__linux__unittest.cc
@@ -0,0 +1,14 @@
+--- net/base/address_tracker_linux_unittest.cc.orig	2016-05-11 19:02:24 UTC
++++ net/base/address_tracker_linux_unittest.cc
+@@ -8,7 +8,11 @@
+ #include "base/threading/simple_thread.h"
+ #include "net/base/address_tracker_linux.h"
+ 
++#if defined(__linux__)
+ #include <linux/if.h>
++#else
++#include <net/if.h>
++#endif
+ 
+ #include <vector>
+ 
diff --git a/www/chromium/files/patch-net_base_mime__util__unittest.cc b/www/chromium/files/patch-net_base_mime__util__unittest.cc
new file mode 100644
index 000000000000..3dddf3a79711
--- /dev/null
+++ b/www/chromium/files/patch-net_base_mime__util__unittest.cc
@@ -0,0 +1,11 @@
+--- net/base/mime_util_unittest.cc.orig	2016-03-25 13:04:50 UTC
++++ net/base/mime_util_unittest.cc
+@@ -241,7 +241,7 @@ TEST(MimeUtilTest, TestGetExtensionsForM
+     { "MeSsAge/*",  1, "eml" },
+     { "image/bmp",  1, "bmp" },
+     { "video/*",    6, "mp4" },
+-#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_IOS)
++#if (defined(OS_POSIX) && !defined(OS_MACOSX)) || defined(OS_IOS)
+     { "video/*",    6, "mpg" },
+ #else
+     { "video/*",    6, "mpeg" },
diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc
new file mode 100644
index 000000000000..ad22ff4abbde
--- /dev/null
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -0,0 +1,10 @@
+--- net/base/network_change_notifier.cc.orig	2016-05-11 19:02:24 UTC
++++ net/base/network_change_notifier.cc
+@@ -532,7 +532,6 @@ NetworkChangeNotifier* NetworkChangeNoti
+ #elif defined(OS_MACOSX)
+   return new NetworkChangeNotifierMac();
+ #else
+-  NOTIMPLEMENTED();
+   return NULL;
+ #endif
+ }
diff --git a/www/chromium/files/patch-net_base_network__interfaces__linux.cc b/www/chromium/files/patch-net_base_network__interfaces__linux.cc
new file mode 100644
index 000000000000..2fec83fbf0c7
--- /dev/null
+++ b/www/chromium/files/patch-net_base_network__interfaces__linux.cc
@@ -0,0 +1,105 @@
+--- net/base/network_interfaces_linux.cc.orig	2016-05-11 19:02:24 UTC
++++ net/base/network_interfaces_linux.cc
+@@ -4,12 +4,14 @@
+ 
+ #include "net/base/network_interfaces_linux.h"
+ 
++#if !defined(OS_FREEBSD)
+ #if !defined(OS_ANDROID)
+ #include <linux/ethtool.h>
+ #endif  // !defined(OS_ANDROID)
+ #include <linux/if.h>
+ #include <linux/sockios.h>
+ #include <linux/wireless.h>
++#endif  // !defined(OS_FREEBSD)
+ #include <set>
+ #include <sys/ioctl.h>
+ #include <sys/types.h>
+@@ -44,6 +46,7 @@ bool TryConvertNativeToNetIPAttributes(i
+   // are still progressing through duplicated address detection (DAD)
+   // and shouldn't be used by the application layer until DAD process
+   // is completed.
++#if !defined(OS_FREEBSD)
+   if (native_attributes & (
+ #if !defined(OS_ANDROID)
+                               IFA_F_OPTIMISTIC | IFA_F_DADFAILED |
+@@ -61,6 +64,10 @@ bool TryConvertNativeToNetIPAttributes(i
+   }
+ 
+   return true;
++#else
++  // the flags tested above are not present on FreeBSD
++  return false;
++#endif  // !OS_FREEBSD
+ }
+ 
+ }  // namespace
+@@ -79,13 +86,15 @@ NetworkChangeNotifier::ConnectionType Ge
+   if (!s.is_valid())
+     return NetworkChangeNotifier::CONNECTION_UNKNOWN;
+ 
++#if !defined(OS_FREEBSD)
+   // Test wireless extensions for CONNECTION_WIFI
+   struct iwreq pwrq = {};
+   strncpy(pwrq.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
+   if (ioctl(s.get(), SIOCGIWNAME, &pwrq) != -1)
+     return NetworkChangeNotifier::CONNECTION_WIFI;
++#endif  // !defined(OS_FREEBSD)
+ 
+-#if !defined(OS_ANDROID)
++#if !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+   // Test ethtool for CONNECTION_ETHERNET
+   struct ethtool_cmd ecmd = {};
+   ecmd.cmd = ETHTOOL_GSET;
+@@ -94,12 +103,13 @@ NetworkChangeNotifier::ConnectionType Ge
+   strncpy(ifr.ifr_name, ifname.c_str(), IFNAMSIZ - 1);
+   if (ioctl(s.get(), SIOCETHTOOL, &ifr) != -1)
+     return NetworkChangeNotifier::CONNECTION_ETHERNET;
+-#endif  // !defined(OS_ANDROID)
++#endif  // !defined(OS_ANDROID) && !defined(OS_FREEBSD)
+ 
+   return NetworkChangeNotifier::CONNECTION_UNKNOWN;
+ }
+ 
+ std::string GetInterfaceSSID(const std::string& ifname) {
++#if !defined(OS_FREEBSD)
+   base::ScopedFD ioctl_socket(socket(AF_INET, SOCK_DGRAM, 0));
+   if (!ioctl_socket.is_valid())
+     return "";
+@@ -111,9 +121,11 @@ std::string GetInterfaceSSID(const std::
+   wreq.u.essid.length = IW_ESSID_MAX_SIZE;
+   if (ioctl(ioctl_socket.get(), SIOCGIWESSID, &wreq) != -1)
+     return ssid;
++#endif  // !defined(OS_FREEBSD)
+   return "";
+ }
+ 
++#if !defined(OS_FREEBSD)
+ bool GetNetworkListImpl(
+     NetworkInterfaceList* networks,
+     int policy,
+@@ -182,6 +194,7 @@ bool GetNetworkListImpl(
+ 
+   return true;
+ }
++#endif  // !defined(OS_FREEBSD)
+ 
+ std::string GetWifiSSIDFromInterfaceListInternal(
+     const NetworkInterfaceList& interfaces,
+@@ -206,12 +219,16 @@ bool GetNetworkList(NetworkInterfaceList
+   if (networks == NULL)
+     return false;
+ 
++#if !defined(OS_FREEBSD)
+   internal::AddressTrackerLinux tracker;
+   tracker.Init();
+ 
+   return internal::GetNetworkListImpl(
+       networks, policy, tracker.GetOnlineLinks(), tracker.GetAddressMap(),
+       &internal::AddressTrackerLinux::GetInterfaceName);
++#else
++  return false;
++#endif
+ }
+ 
+ std::string GetWifiSSID() {
diff --git a/www/chromium/files/patch-net_base_network__interfaces__posix.cc b/www/chromium/files/patch-net_base_network__interfaces__posix.cc
new file mode 100644
index 000000000000..b74d1ed8aa97
--- /dev/null
+++ b/www/chromium/files/patch-net_base_network__interfaces__posix.cc
@@ -0,0 +1,18 @@
+--- net/base/network_interfaces_posix.cc.orig	2016-05-11 19:02:24 UTC
++++ net/base/network_interfaces_posix.cc
+@@ -20,6 +20,7 @@ namespace net {
+ #if !defined(OS_NACL)
+ namespace internal {
+ 
++#if !defined(OS_BSD)
+ // The application layer can pass |policy| defined in net_util.h to
+ // request filtering out certain type of interfaces.
+ bool ShouldIgnoreInterface(const std::string& name, int policy) {
+@@ -33,6 +34,7 @@ bool ShouldIgnoreInterface(const std::st
+ 
+   return false;
+ }
++#endif
+ 
+ // Check if the address is unspecified (i.e. made of zeroes) or loopback.
+ bool IsLoopbackOrUnspecifiedAddress(const sockaddr* addr) {
diff --git a/www/chromium/files/patch-net_dns_address__sorter__posix.cc b/www/chromium/files/patch-net_dns_address__sorter__posix.cc
new file mode 100644
index 000000000000..cdc2f6880222
--- /dev/null
+++ b/www/chromium/files/patch-net_dns_address__sorter__posix.cc
@@ -0,0 +1,10 @@
+--- net/dns/address_sorter_posix.cc.orig	2016-05-11 19:02:24 UTC
++++ net/dns/address_sorter_posix.cc
+@@ -11,6 +11,7 @@
+ #include <sys/socket.h>  // Must be included before ifaddrs.h.
+ #include <ifaddrs.h>
+ #include <net/if.h>
++#include <net/if_var.h>
+ #include <netinet/in_var.h>
+ #include <string.h>
+ #include <sys/ioctl.h>
diff --git a/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
new file mode 100644
index 000000000000..7bb196ec9e9c
--- /dev/null
+++ b/www/chromium/files/patch-net_dns_dns__config__service__posix__unittest.cc
@@ -0,0 +1,11 @@
+--- net/dns/dns_config_service_posix_unittest.cc.orig	2016-05-11 19:02:24 UTC
++++ net/dns/dns_config_service_posix_unittest.cc
+@@ -2,8 +2,6 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
+-#include <resolv.h>
+-
+ #include "base/cancelable_callback.h"
+ #include "base/files/file_util.h"
+ #include "base/sys_byteorder.h"
diff --git a/www/chromium/files/patch-net_dns_dns__reloader.cc b/www/chromium/files/patch-net_dns_dns__reloader.cc
new file mode 100644
index 000000000000..8fa4485f8ca5
--- /dev/null
+++ b/www/chromium/files/patch-net_dns_dns__reloader.cc
@@ -0,0 +1,13 @@
+--- net/dns/dns_reloader.cc.orig	2016-03-25 13:04:50 UTC
++++ net/dns/dns_reloader.cc
+@@ -7,6 +7,10 @@
+ #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
+     !defined(OS_ANDROID)
+ 
++#if defined(OS_FREEBSD)
++#include <netinet/in.h>
++#endif
++
+ #include <resolv.h>
+ 
+ #include "base/lazy_instance.h"
diff --git a/www/chromium/files/patch-net_dns_dns__session.cc b/www/chromium/files/patch-net_dns_dns__session.cc
new file mode 100644
index 000000000000..e504bd5cb7f5
--- /dev/null
+++ b/www/chromium/files/patch-net_dns_dns__session.cc
@@ -0,0 +1,11 @@
+--- net/dns/dns_session.cc.orig	2016-05-11 19:02:24 UTC
++++ net/dns/dns_session.cc
+@@ -190,7 +190,7 @@ void DnsSession::RecordRTT(unsigned serv
+   base::TimeDelta current_error = rtt - estimate;
+   estimate += current_error / 8;  // * alpha
+   base::TimeDelta abs_error = base::TimeDelta::FromInternalValue(
+-      std::abs(current_error.ToInternalValue()));
++      std::labs(current_error.ToInternalValue()));
+   deviation += (abs_error - deviation) / 4;  // * delta
+ 
+   // Histogram-based method.
diff --git a/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
new file mode 100644
index 000000000000..2d1b159a66a1
--- /dev/null
+++ b/www/chromium/files/patch-net_http_http__auth__gssapi__posix.cc
@@ -0,0 +1,13 @@
+--- net/http/http_auth_gssapi_posix.cc.orig	2016-05-11 19:02:24 UTC
++++ net/http/http_auth_gssapi_posix.cc
+@@ -431,8 +431,8 @@ base::NativeLibrary GSSAPISharedLibrary:
+     static const char* const kDefaultLibraryNames[] = {
+ #if defined(OS_MACOSX)
+       "/System/Library/Frameworks/Kerberos.framework/Kerberos"
+-#elif defined(OS_OPENBSD)
+-      "libgssapi.so"          // Heimdal - OpenBSD
++#elif defined(OS_BSD)
++      "libgssapi.so"          // Heimdal - OpenBSD / FreeBSD
+ #else
+       "libgssapi_krb5.so.2",  // MIT Kerberos - FC, Suse10, Debian
+       "libgssapi.so.4",       // Heimdal - Suse10, MDK
diff --git a/www/chromium/files/patch-net_net.gyp b/www/chromium/files/patch-net_net.gyp
new file mode 100644
index 000000000000..56c16bb2e355
--- /dev/null
+++ b/www/chromium/files/patch-net_net.gyp
@@ -0,0 +1,23 @@
+--- net/net.gyp.orig	2016-05-11 19:02:24 UTC
++++ net/net.gyp
+@@ -163,7 +163,7 @@
+         '<@(net_test_sources)',
+       ],
+       'conditions': [
+-        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
++        ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android" and os_bsd != 1', {
+           'dependencies': [
+             'epoll_quic_tools',
+             'epoll_server',
+@@ -678,6 +678,11 @@
+             'url_request/test_url_request_interceptor.h',
+           ],
+         }],
++        [ 'os_bsd == 1', {
++          'sources!': [
++            'base/address_tracker_linux_unittest.cc',
++          ],
++        }],
+       ],
+       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+       'msvs_disabled_warnings': [4267, ],
diff --git a/www/chromium/files/patch-net_net.gypi b/www/chromium/files/patch-net_net.gypi
new file mode 100644
index 000000000000..4a6fbca50305
--- /dev/null
+++ b/www/chromium/files/patch-net_net.gypi
@@ -0,0 +1,22 @@
+--- net/net.gypi.orig	2016-05-11 19:02:24 UTC
++++ net/net.gypi
+@@ -439,8 +439,8 @@
+       'android/network_library.h',
+       'android/traffic_stats.cc',
+       'android/traffic_stats.h',
+-      'base/address_tracker_linux.cc',
+-      'base/address_tracker_linux.h',
++#      'base/address_tracker_linux.cc',
++#      'base/address_tracker_linux.h',
+       'base/backoff_entry.cc',
+       'base/backoff_entry.h',
+       'base/backoff_entry_serializer.cc',
+@@ -1310,7 +1310,7 @@
+       'android/traffic_stats_unittest.cc',
+       'base/address_family_unittest.cc',
+       'base/address_list_unittest.cc',
+-      'base/address_tracker_linux_unittest.cc',
++#      'base/address_tracker_linux_unittest.cc',
+       'base/backoff_entry_serializer_unittest.cc',
+       'base/backoff_entry_unittest.cc',
+       'base/chunked_upload_data_stream_unittest.cc',
diff --git a/www/chromium/files/patch-net_net__common.gypi b/www/chromium/files/patch-net_net__common.gypi
new file mode 100644
index 000000000000..a82d04961410
--- /dev/null
+++ b/www/chromium/files/patch-net_net__common.gypi
@@ -0,0 +1,14 @@
+--- net/net_common.gypi.orig	2016-05-11 19:02:24 UTC
++++ net/net_common.gypi
+@@ -242,9 +242,10 @@
+         'conditions': [
+           ['os_bsd==1', {
+             'sources!': [
++              'base/address_tracker_linux.cc',
+               'base/network_change_notifier_linux.cc',
+               'base/network_change_notifier_netlink_linux.cc',
+-              'proxy/proxy_config_service_linux.cc',
++#              'proxy/proxy_config_service_linux.cc',
+             ],
+           },{
+             'dependencies': [
diff --git a/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
new file mode 100644
index 000000000000..cf82ff8b3b38
--- /dev/null
+++ b/www/chromium/files/patch-net_proxy_proxy__config__service__linux.cc
@@ -0,0 +1,145 @@
+--- net/proxy/proxy_config_service_linux.cc.orig	2016-05-11 19:02:24 UTC
++++ net/proxy/proxy_config_service_linux.cc
+@@ -11,7 +11,14 @@
+ #include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#if defined(OS_FREEBSD)
++#include <fcntl.h>
++#include <sys/types.h>
++#include <sys/event.h>
++#include <sys/time.h>
++#else
+ #include <sys/inotify.h>
++#endif
+ #include <unistd.h>
+ 
+ #include <map>
+@@ -859,6 +866,7 @@ class SettingGetterImplKDE : public Prox
+  public:
+   explicit SettingGetterImplKDE(base::Environment* env_var_getter)
+       : inotify_fd_(-1),
++        config_fd_(-1),
+         notify_delegate_(NULL),
+         debounce_timer_(new base::OneShotTimer()),
+         indirect_manual_(false),
+@@ -933,9 +941,10 @@ class SettingGetterImplKDE : public Prox
+     // and pending tasks may then be deleted without being run.
+     // Here in the KDE version, we can safely close the file descriptor
+     // anyway. (Not that it really matters; the process is exiting.)
+-    if (inotify_fd_ >= 0)
++    if (inotify_fd_ >= 0 || config_fd_ >= 0)
+       ShutDown();
+     DCHECK(inotify_fd_ < 0);
++    DCHECK(config_fd_ < 0);
+   }
+ 
+   bool Init(const scoped_refptr<base::SingleThreadTaskRunner>& glib_task_runner,
+@@ -944,9 +953,17 @@ class SettingGetterImplKDE : public Prox
+     // This has to be called on the UI thread (http://crbug.com/69057).
+     base::ThreadRestrictions::ScopedAllowIO allow_io;
+     DCHECK(inotify_fd_ < 0);
++#if defined(OS_FREEBSD)
++    inotify_fd_ = kqueue();
++#else
+     inotify_fd_ = inotify_init();
++#endif
+     if (inotify_fd_ < 0) {
++#if defined(OS_FREEBSD)
++      PLOG(ERROR) << "kqueue failed";
++#else
+       PLOG(ERROR) << "inotify_init failed";
++#endif
+       return false;
+     }
+     if (!base::SetNonBlocking(inotify_fd_)) {
+@@ -970,22 +987,40 @@ class SettingGetterImplKDE : public Prox
+       close(inotify_fd_);
+       inotify_fd_ = -1;
+     }
++    if (config_fd_ >= 0) {
++      close(config_fd_);
++      config_fd_ = -1;
++    }
+     debounce_timer_.reset();
+   }
+ 
+   bool SetUpNotifications(
+       ProxyConfigServiceLinux::Delegate* delegate) override {
+     DCHECK(inotify_fd_ >= 0);
++    DCHECK(config_fd_ >= 0);
+     DCHECK(file_task_runner_->BelongsToCurrentThread());
+     // We can't just watch the kioslaverc file directly, since KDE will write
+     // a new copy of it and then rename it whenever settings are changed and
+     // inotify watches inodes (so we'll be watching the old deleted file after
+     // the first change, and it will never change again). So, we watch the
+     // directory instead. We then act only on changes to the kioslaverc entry.
++#if defined(OS_FREEBSD)
++    config_fd_ = HANDLE_EINTR(open(kde_config_dir_.value().c_str(), O_RDONLY));
++
++    if (config_fd_ == -1)
++      return false;
++
++    struct kevent ev;
++    EV_SET(&ev, config_fd_, EVFILT_VNODE, EV_ADD | EV_CLEAR, NOTE_WRITE,
++            0, NULL);
++    if (kevent(inotify_fd_, &ev, 1, NULL, 0, NULL) == -1)
++      return false;
++#else
+     if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(),
+                           IN_MODIFY | IN_MOVED_TO) < 0) {
+       return false;
+     }
++#endif
+     notify_delegate_ = delegate;
+     if (!base::MessageLoopForIO::current()->WatchFileDescriptor(
+             inotify_fd_, true, base::MessageLoopForIO::WATCH_READ,
+@@ -1006,7 +1041,19 @@ class SettingGetterImplKDE : public Prox
+   void OnFileCanReadWithoutBlocking(int fd) override {
+     DCHECK_EQ(fd, inotify_fd_);
+     DCHECK(file_task_runner_->BelongsToCurrentThread());
++#if defined(OS_FREEBSD)
++    struct kevent ev;
++    int rv = kevent(inotify_fd_, NULL, 0, &ev, 1, NULL);
++
++    if (rv != -1 && (ev.flags & EV_ERROR) == 0) {
++      OnChangeNotification();
++    } else {
++      LOG(ERROR) << "kevent() failure; no longer watching kioslaverc!";
++      ShutDown();
++    }
++#else
+     OnChangeNotification();
++#endif
+   }
+   void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); }
+ 
+@@ -1279,8 +1326,11 @@ class SettingGetterImplKDE : public Prox
+   void OnChangeNotification() {
+     DCHECK_GE(inotify_fd_,  0);
+     DCHECK(file_task_runner_->BelongsToCurrentThread());
+-    char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
+     bool kioslaverc_touched = false;
++#if defined(OS_FREEBSD)
++    kioslaverc_touched = true;
++#else
++    char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
+     ssize_t r;
+     while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
+       // inotify returns variable-length structures, which is why we have
+@@ -1317,6 +1367,7 @@ class SettingGetterImplKDE : public Prox
+         inotify_fd_ = -1;
+       }
+     }
++#endif
+     if (kioslaverc_touched) {
+       // We don't use Reset() because the timer may not yet be running.
+       // (In that case Stop() is a no-op.)
+@@ -1332,6 +1383,7 @@ class SettingGetterImplKDE : public Prox
+                    std::vector<std::string> > strings_map_type;
+ 
+   int inotify_fd_;
++  int config_fd_;
+   base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
+   ProxyConfigServiceLinux::Delegate* notify_delegate_;
+   scoped_ptr<base::OneShotTimer> debounce_timer_;
diff --git a/www/chromium/files/patch-net_proxy_proxy__service.cc b/www/chromium/files/patch-net_proxy_proxy__service.cc
new file mode 100644
index 000000000000..f8a4295602f7
--- /dev/null
+++ b/www/chromium/files/patch-net_proxy_proxy__service.cc
@@ -0,0 +1,20 @@
+--- net/proxy/proxy_service.cc.orig	2016-05-11 19:02:24 UTC
++++ net/proxy/proxy_service.cc
+@@ -47,7 +47,7 @@
+ #elif defined(OS_MACOSX)
+ #include "net/proxy/proxy_config_service_mac.h"
+ #include "net/proxy/proxy_resolver_mac.h"
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ #include "net/proxy/proxy_config_service_linux.h"
+ #elif defined(OS_ANDROID)
+ #include "net/proxy/proxy_config_service_android.h"
+@@ -1503,7 +1503,7 @@ scoped_ptr<ProxyConfigService> ProxyServ
+              << "profile_io_data.cc::CreateProxyConfigService and this should "
+              << "be used only for examples.";
+   return make_scoped_ptr(new UnsetProxyConfigService);
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_FREEBSD)
+   scoped_ptr<ProxyConfigServiceLinux> linux_config_service(
+       new ProxyConfigServiceLinux());
+ 
diff --git a/www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc b/www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc
new file mode 100644
index 000000000000..41aa42027f0d
--- /dev/null
+++ b/www/chromium/files/patch-net_quic_congestion__control_rtt__stats.cc
@@ -0,0 +1,29 @@
+--- net/quic/congestion_control/rtt_stats.cc.orig	2016-05-11 19:02:24 UTC
++++ net/quic/congestion_control/rtt_stats.cc
+@@ -4,7 +4,7 @@
+ 
+ #include "net/quic/congestion_control/rtt_stats.h"
+ 
+-#include <cstdlib>  // std::abs
++#include <cstdlib>  // std::labs
+ 
+ using std::max;
+ 
+@@ -41,7 +41,7 @@ void RttStats::ExpireSmoothedMetrics() {
+   mean_deviation_ =
+       max(mean_deviation_,
+           QuicTime::Delta::FromMicroseconds(
+-              std::abs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds())));
++              std::labs(smoothed_rtt_.Subtract(latest_rtt_).ToMicroseconds())));
+   smoothed_rtt_ = max(smoothed_rtt_, latest_rtt_);
+ }
+ 
+@@ -81,7 +81,7 @@ void RttStats::UpdateRtt(QuicTime::Delta
+   } else {
+     mean_deviation_ = QuicTime::Delta::FromMicroseconds(static_cast<int64_t>(
+         kOneMinusBeta * mean_deviation_.ToMicroseconds() +
+-        kBeta * std::abs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())));
++        kBeta * std::labs(smoothed_rtt_.Subtract(rtt_sample).ToMicroseconds())));
+     smoothed_rtt_ =
+         smoothed_rtt_.Multiply(kOneMinusAlpha).Add(rtt_sample.Multiply(kAlpha));
+     DVLOG(1) << " smoothed_rtt(us):" << smoothed_rtt_.ToMicroseconds()
diff --git a/www/chromium/files/patch-net_socket_socks5__client__socket.cc b/www/chromium/files/patch-net_socket_socks5__client__socket.cc
new file mode 100644
index 000000000000..a21636b1aaf0
--- /dev/null
+++ b/www/chromium/files/patch-net_socket_socks5__client__socket.cc
@@ -0,0 +1,13 @@
+--- net/socket/socks5_client_socket.cc.orig	2016-05-11 19:02:24 UTC
++++ net/socket/socks5_client_socket.cc
+@@ -4,6 +4,10 @@
+ 
+ #include "net/socket/socks5_client_socket.h"
+ 
++#if defined(OS_BSD)
++#include <netinet/in.h>
++#endif
++
+ #include <utility>
+ 
+ #include "base/callback_helpers.h"
diff --git a/www/chromium/files/patch-net_udp_udp__socket__unittest.cc b/www/chromium/files/patch-net_udp_udp__socket__unittest.cc
new file mode 100644
index 000000000000..05fc5116c72a
--- /dev/null
+++ b/www/chromium/files/patch-net_udp_udp__socket__unittest.cc
@@ -0,0 +1,11 @@
+--- net/udp/udp_socket_unittest.cc.orig	2016-05-11 19:02:25 UTC
++++ net/udp/udp_socket_unittest.cc
+@@ -266,7 +266,7 @@ TEST_F(UDPSocketTest, ConnectNonBlocking
+ }
+ #endif
+ 
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ // UDPSocketPrivate_Broadcast is disabled for OSX because it requires
+ // root permissions on OSX 10.7+.
+ TEST_F(UDPSocketTest, DISABLED_Broadcast) {
diff --git a/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
new file mode 100644
index 000000000000..a8d317b11894
--- /dev/null
+++ b/www/chromium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -0,0 +1,56 @@
+--- pdf/pdfium/pdfium_engine.cc.orig	2016-05-11 19:02:25 UTC
++++ pdf/pdfium/pdfium_engine.cc
+@@ -121,7 +121,7 @@ std::vector<uint32_t> GetPageNumbersFrom
+   return page_numbers;
+ }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ 
+ PP_Instance g_last_instance_id;
+ 
+@@ -507,7 +507,7 @@ bool InitializeSDK() {
+   config.m_v8EmbedderSlot = gin::kEmbedderPDFium;
+   FPDF_InitLibraryWithConfig(&config);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Font loading doesn't work in the renderer sandbox in Linux.
+   FPDF_SetSystemFontInfo(&g_font_info);
+ #endif
+@@ -620,7 +620,7 @@ PDFiumEngine::PDFiumEngine(PDFEngine::Cl
+   IFSDK_PAUSE::user = nullptr;
+   IFSDK_PAUSE::NeedToPauseNow = Pause_NeedToPauseNow;
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // PreviewModeClient does not know its pp::Instance.
+   pp::Instance* instance = client_->GetPluginInstance();
+   if (instance)
+@@ -1330,7 +1330,7 @@ pp::Buffer_Dev PDFiumEngine::PrintPagesA
+     FPDF_ClosePage(pdf_page);
+   }
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
+ #endif
+ 
+@@ -2688,7 +2688,7 @@ bool PDFiumEngine::ContinuePaint(int pro
+   DCHECK_LT(static_cast<size_t>(progressive_index), progressive_paints_.size());
+   DCHECK(image_data);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   g_last_instance_id = client_->GetPluginInstance()->pp_instance();
+ #endif
+ 
+@@ -3142,7 +3142,7 @@ void PDFiumEngine::SetCurrentPage(int in
+     FORM_DoPageAAction(old_page, form_, FPDFPAGE_AACTION_CLOSE);
+   }
+   most_visible_page_ = index;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     g_last_instance_id = client_->GetPluginInstance()->pp_instance();
+ #endif
+   if (most_visible_page_ != -1 && called_do_document_action_) {
diff --git a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc b/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
deleted file mode 100644
index e37aa60d1696..000000000000
--- a/www/chromium/files/patch-ppapi__proxy__file_io_resource.cc
+++ /dev/null
@@ -1,48 +0,0 @@
---- ppapi/proxy/file_io_resource.cc.orig	2016-03-25 14:04:51.000000000 +0100
-+++ ppapi/proxy/file_io_resource.cc	2016-03-29 21:54:44.709418000 +0200
-@@ -285,17 +285,19 @@
- 
-   if (check_quota_) {
-     int64_t increase = 0;
--    uint64_t max_offset = 0;
-+    uint64_t _max_offset = 0;
-+    // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
-+    // which also defines max_offset
-     bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
-     if (append) {
-       increase = bytes_to_write;
-     } else {
--      uint64_t max_offset = offset + bytes_to_write;
--      if (max_offset >
-+      uint64_t _max_offset = offset + bytes_to_write;
-+      if (_max_offset >
-           static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
-         return PP_ERROR_FAILED;  // amount calculation would overflow.
-       }
--      increase = static_cast<int64_t>(max_offset) - max_written_offset_;
-+      increase = static_cast<int64_t>(_max_offset) - max_written_offset_;
-     }
- 
-     if (increase > 0) {
-@@ -319,7 +321,7 @@
-       if (append)
-         append_mode_write_amount_ += bytes_to_write;
-       else
--        max_written_offset_ = max_offset;
-+        max_written_offset_ = _max_offset;
-     }
-   }
-   return WriteValidated(offset, buffer, bytes_to_write, callback);
-@@ -597,9 +599,9 @@
-   } else {
-     DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
- 
--    int64_t max_offset = offset + bytes_to_write;
--    if (max_written_offset_ < max_offset)
--      max_written_offset_ = max_offset;
-+    int64_t _max_offset = offset + bytes_to_write;
-+    if (max_written_offset_ < _max_offset)
-+      max_written_offset_ = _max_offset;
-   }
- 
-   if (callback->is_blocking()) {
diff --git a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc b/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
deleted file mode 100644
index 1c56ba5a34a1..000000000000
--- a/www/chromium/files/patch-ppapi__shared_impl__private__net_address_private_impl.cc
+++ /dev/null
@@ -1,16 +0,0 @@
---- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2016-03-05 12:05:33.124839671 +0100
-+++ ppapi/shared_impl/private/net_address_private_impl.cc	2016-03-05 12:06:39.850834354 +0100
-@@ -26,9 +26,12 @@
- #include <arpa/inet.h>
- #include <sys/socket.h>
- #include <sys/types.h>
-+#if defined(OS_BSD)
-+#include <netinet/in.h>
-+#endif
- #endif
- 
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // This is a bit evil, but it's standard operating procedure for |s6_addr|....
- #define s6_addr16 __u6_addr.__u6_addr16
- #endif
diff --git a/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
new file mode 100644
index 000000000000..3f7401092341
--- /dev/null
+++ b/www/chromium/files/patch-ppapi_proxy_file__io__resource.cc
@@ -0,0 +1,48 @@
+--- ppapi/proxy/file_io_resource.cc.orig	2016-05-11 19:02:25 UTC
++++ ppapi/proxy/file_io_resource.cc
+@@ -285,17 +285,19 @@ int32_t FileIOResource::Write(int64_t of
+ 
+   if (check_quota_) {
+     int64_t increase = 0;
+-    uint64_t max_offset = 0;
++    uint64_t _max_offset = 0;
++    // (rene) avoid name collission with /usr/include/vm/vm_map.h on FreeBSD
++    // which also defines max_offset
+     bool append = (open_flags_ & PP_FILEOPENFLAG_APPEND) != 0;
+     if (append) {
+       increase = bytes_to_write;
+     } else {
+-      uint64_t max_offset = offset + bytes_to_write;
+-      if (max_offset >
++      uint64_t _max_offset = offset + bytes_to_write;
++      if (_max_offset >
+           static_cast<uint64_t>(std::numeric_limits<int64_t>::max())) {
+         return PP_ERROR_FAILED;  // amount calculation would overflow.
+       }
+-      increase = static_cast<int64_t>(max_offset) - max_written_offset_;
++      increase = static_cast<int64_t>(_max_offset) - max_written_offset_;
+     }
+ 
+     if (increase > 0) {
+@@ -319,7 +321,7 @@ int32_t FileIOResource::Write(int64_t of
+       if (append)
+         append_mode_write_amount_ += bytes_to_write;
+       else
+-        max_written_offset_ = max_offset;
++        max_written_offset_ = _max_offset;
+     }
+   }
+   return WriteValidated(offset, buffer, bytes_to_write, callback);
+@@ -597,9 +599,9 @@ void FileIOResource::OnRequestWriteQuota
+   } else {
+     DCHECK_LE(offset + bytes_to_write - max_written_offset_, granted);
+ 
+-    int64_t max_offset = offset + bytes_to_write;
+-    if (max_written_offset_ < max_offset)
+-      max_written_offset_ = max_offset;
++    int64_t _max_offset = offset + bytes_to_write;
++    if (max_written_offset_ < _max_offset)
++      max_written_offset_ = _max_offset;
+   }
+ 
+   if (callback->is_blocking()) {
diff --git a/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc b/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
new file mode 100644
index 000000000000..d8cbb29860cf
--- /dev/null
+++ b/www/chromium/files/patch-ppapi_shared__impl_private_net__address__private__impl.cc
@@ -0,0 +1,16 @@
+--- ppapi/shared_impl/private/net_address_private_impl.cc.orig	2016-05-11 19:02:25 UTC
++++ ppapi/shared_impl/private/net_address_private_impl.cc
+@@ -26,9 +26,12 @@
+ #include <arpa/inet.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
++#if defined(OS_BSD)
++#include <netinet/in.h>
++#endif
+ #endif
+ 
+-#if defined(OS_MACOSX)
++#if defined(OS_MACOSX) || defined(OS_BSD)
+ // This is a bit evil, but it's standard operating procedure for |s6_addr|....
+ #define s6_addr16 __u6_addr.__u6_addr16
+ #endif
diff --git a/www/chromium/files/patch-printing__printing.gyp b/www/chromium/files/patch-printing__printing.gyp
deleted file mode 100644
index 78c655c9797a..000000000000
--- a/www/chromium/files/patch-printing__printing.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- printing/printing.gyp.orig	2014-10-10 08:54:16 UTC
-+++ printing/printing.gyp
-@@ -187,7 +187,7 @@
-             'backend/print_backend_chromeos.cc',
-           ],
-         }],
--        ['OS=="linux" and chromeos==0', {
-+        ['(OS=="linux" or os_bsd == 1) and chromeos==0', {
-           'sources': [
-             'printing_context_linux.cc',
-             'printing_context_linux.h',
diff --git a/www/chromium/files/patch-printing_printing.gyp b/www/chromium/files/patch-printing_printing.gyp
new file mode 100644
index 000000000000..fbc288bf9ac6
--- /dev/null
+++ b/www/chromium/files/patch-printing_printing.gyp
@@ -0,0 +1,11 @@
+--- printing/printing.gyp.orig	2016-04-08 16:02:10 UTC
++++ printing/printing.gyp
+@@ -187,7 +187,7 @@
+             'backend/print_backend_chromeos.cc',
+           ],
+         }],
+-        ['OS=="linux" and chromeos==0', {
++        ['(OS=="linux" or os_bsd == 1) and chromeos==0', {
+           'sources': [
+             'printing_context_linux.cc',
+             'printing_context_linux.h',
diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi
deleted file mode 100644
index b86aa5e4af49..000000000000
--- a/www/chromium/files/patch-remoting__remoting_host.gypi
+++ /dev/null
@@ -1,54 +0,0 @@
---- remoting/remoting_host.gypi.orig	2015-10-14 03:01:21.000000000 -0400
-+++ remoting/remoting_host.gypi	2015-10-23 13:56:18.229194000 -0400
-@@ -18,7 +18,7 @@
-         'remoting_host_win.gypi',
-       ],
-     }],
--    ['OS=="linux"', {
-+    ['OS=="linux" or os_bsd==1', {
-       'includes': [
-         'remoting_host_linux.gypi',
-       ],
-@@ -57,7 +57,7 @@
-             '<@(remoting_host_sources)',
-           ],
-           'conditions': [
--            ['OS=="linux"', {
-+            ['OS=="linux" or os_bsd==1', {
-               'conditions': [
-                 ['use_x11==1', {
-                   'dependencies': [
-@@ -331,7 +331,7 @@
-             'host/setup/start_host.cc',
-           ],
-           'conditions': [
--            ['OS=="linux" and use_allocator!="none"', {
-+            ['(OS=="linux" or os_bsd==1) and use_allocator!="none"', {
-               'dependencies': [
-                 '../base/allocator/allocator.gyp:allocator',
-               ],
-@@ -549,7 +549,7 @@
-                 }],  # mac_breakpad==1
-               ],  # conditions
-             }],  # OS=mac
--            ['OS=="linux" and use_allocator!="none"', {
-+            ['(OS=="linux" or os_bsd==1) and use_allocator!="none"', {
-               'dependencies': [
-                 '../base/allocator/allocator.gyp:allocator',
-               ],
-@@ -671,13 +671,13 @@
-                 'host/it2me/it2me_native_messaging_host_main.h',
-               ],
-               'conditions': [
--                ['OS=="linux" and chromeos==0 and use_ozone==0', {
-+                ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', {
-                   'dependencies': [
-                     # Always use GTK on Linux, even for Aura builds.
-                     '../build/linux/system.gyp:gtk2',
-                   ],
-                 }],
--                ['OS=="linux" and use_allocator!="none"', {
-+                ['(OS=="linux" or os_bsd==1) and use_allocator!="none"', {
-                   'dependencies': [
-                     '../base/allocator/allocator.gyp:allocator',
-                   ],
diff --git a/www/chromium/files/patch-remoting_remoting__host.gypi b/www/chromium/files/patch-remoting_remoting__host.gypi
new file mode 100644
index 000000000000..3e69de760f13
--- /dev/null
+++ b/www/chromium/files/patch-remoting_remoting__host.gypi
@@ -0,0 +1,29 @@
+--- remoting/remoting_host.gypi.orig	2016-05-11 19:02:25 UTC
++++ remoting/remoting_host.gypi
+@@ -18,7 +18,7 @@
+         'remoting_host_win.gypi',
+       ],
+     }],
+-    ['OS=="linux"', {
++    ['OS=="linux" or os_bsd==1', {
+       'includes': [
+         'remoting_host_linux.gypi',
+       ],
+@@ -57,7 +57,7 @@
+             '<@(remoting_host_sources)',
+           ],
+           'conditions': [
+-            ['OS=="linux"', {
++            ['OS=="linux" or os_bsd==1', {
+               'conditions': [
+                 ['use_x11==1', {
+                   'dependencies': [
+@@ -652,7 +652,7 @@
+                 'host/it2me/it2me_native_messaging_host_main.h',
+               ],
+               'conditions': [
+-                ['OS=="linux" and chromeos==0 and use_ozone==0', {
++                ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', {
+                   'dependencies': [
+                     # Always use GTK on Linux, even for Aura builds.
+                     '../build/linux/system.gyp:gtk2',
diff --git a/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp b/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp
deleted file mode 100644
index 1d5f1535dfee..000000000000
--- a/www/chromium/files/patch-skia__ext__SkMemory_new_handler.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- skia/ext/SkMemory_new_handler.cpp.orig	2015-08-22 15:01:57.000000000 -0400
-+++ skia/ext/SkMemory_new_handler.cpp	2015-09-03 11:11:25.462063000 -0400
-@@ -62,7 +62,7 @@
-     // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
-     // doesn't work as intended everywhere.
-     void* result;
--#if  defined(OS_IOS)
-+#if  defined(OS_IOS) || defined(OS_FREEBSD)
-     result = malloc(size);
- #else
-     // It's the responsibility of the caller to check the return value.
-@@ -89,7 +89,7 @@
-     // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
-     // doesn't work as intended everywhere.
-     void* result;
--#if  defined(OS_IOS)
-+#if  defined(OS_IOS) || defined(OS_FREEBSD)
-     result = calloc(1, size);
- #else
-     // It's the responsibility of the caller to check the return value.
diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi
deleted file mode 100644
index 22651eb2f119..000000000000
--- a/www/chromium/files/patch-skia__skia_chrome.gypi
+++ /dev/null
@@ -1,14 +0,0 @@
---- skia/skia_chrome.gypi.orig	2015-10-14 18:24:42.938769000 +0200
-+++ skia/skia_chrome.gypi	2015-10-14 18:22:24.515306000 +0200
-@@ -60,6 +60,11 @@
-         'ext/platform_canvas.cc',
-       ],
-     }],
-+    [ 'use_cairo == 1', {
-+      'dependencies': [
-+        '../build/linux/system.gyp:pangocairo',
-+      ],
-+    }],
-     [ 'OS == "android" and '
-       'enable_basic_printing==0 and enable_print_preview==0', {
-       'sources!': [
diff --git a/www/chromium/files/patch-skia__skia_common.gypi b/www/chromium/files/patch-skia__skia_common.gypi
deleted file mode 100644
index 07b71ad2ff9f..000000000000
--- a/www/chromium/files/patch-skia__skia_common.gypi
+++ /dev/null
@@ -1,11 +0,0 @@
---- skia/skia_common.gypi.orig	2014-10-10 08:54:17 UTC
-+++ skia/skia_common.gypi
-@@ -61,7 +61,7 @@
-     }],
- 
-     #Settings for text blitting, chosen to approximate the system browser.
--    [ 'OS == "linux"', {
-+    [ 'OS == "linux" or os_bsd == 1', {
-       'defines': [
-         'SK_GAMMA_EXPONENT=1.2',
-         'SK_GAMMA_CONTRAST=0.2',
diff --git a/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
new file mode 100644
index 000000000000..73a26dd5dfcb
--- /dev/null
+++ b/www/chromium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -0,0 +1,20 @@
+--- skia/ext/SkMemory_new_handler.cpp.orig	2016-04-08 16:02:10 UTC
++++ skia/ext/SkMemory_new_handler.cpp
+@@ -62,7 +62,7 @@ static void* sk_malloc_nothrow(size_t si
+     // TODO(b.kelemen): we should always use UncheckedMalloc but currently it
+     // doesn't work as intended everywhere.
+     void* result;
+-#if  defined(OS_IOS)
++#if  defined(OS_IOS) || defined(OS_FREEBSD)
+     result = malloc(size);
+ #else
+     // It's the responsibility of the caller to check the return value.
+@@ -89,7 +89,7 @@ void* sk_calloc(size_t size) {
+     // TODO(b.kelemen): we should always use UncheckedCalloc but currently it
+     // doesn't work as intended everywhere.
+     void* result;
+-#if  defined(OS_IOS)
++#if  defined(OS_IOS) || defined(OS_FREEBSD)
+     result = calloc(1, size);
+ #else
+     // It's the responsibility of the caller to check the return value.
diff --git a/www/chromium/files/patch-skia_skia__chrome.gypi b/www/chromium/files/patch-skia_skia__chrome.gypi
new file mode 100644
index 000000000000..3718b0a25895
--- /dev/null
+++ b/www/chromium/files/patch-skia_skia__chrome.gypi
@@ -0,0 +1,14 @@
+--- skia/skia_chrome.gypi.orig	2016-04-08 16:02:10 UTC
++++ skia/skia_chrome.gypi
+@@ -61,6 +61,11 @@
+         'ext/platform_canvas.cc',
+       ],
+     }],
++    [ 'use_cairo == 1', {
++      'dependencies': [
++        '../build/linux/system.gyp:pangocairo',
++      ],
++    }],
+     [ 'OS == "android" and '
+       'enable_basic_printing==0 and enable_print_preview==0', {
+       'sources!': [
diff --git a/www/chromium/files/patch-skia_skia__common.gypi b/www/chromium/files/patch-skia_skia__common.gypi
new file mode 100644
index 000000000000..a5d29e9b768c
--- /dev/null
+++ b/www/chromium/files/patch-skia_skia__common.gypi
@@ -0,0 +1,11 @@
+--- skia/skia_common.gypi.orig	2016-05-11 19:02:26 UTC
++++ skia/skia_common.gypi
+@@ -65,7 +65,7 @@
+     }],
+ 
+     #Settings for text blitting, chosen to approximate the system browser.
+-    [ 'OS == "linux"', {
++    [ 'OS == "linux" or os_bsd == 1', {
+       'defines': [
+         'SK_GAMMA_EXPONENT=1.2',
+         'SK_GAMMA_CONTRAST=0.2',
diff --git a/www/chromium/files/patch-sync__util__get_session_name.cc b/www/chromium/files/patch-sync__util__get_session_name.cc
deleted file mode 100644
index ad50caaf9eff..000000000000
--- a/www/chromium/files/patch-sync__util__get_session_name.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- sync/util/get_session_name.cc.orig	2015-08-22 15:01:57.000000000 -0400
-+++ sync/util/get_session_name.cc	2015-09-03 11:15:14.369871000 -0400
-@@ -14,7 +14,7 @@
- 
- #if defined(OS_CHROMEOS)
- #include "chromeos/system/devicetype.h"
--#elif defined(OS_LINUX)
-+#elif (defined(OS_LINUX) || defined(OS_BSD))
- #include "sync/util/get_session_name_linux.h"
- #elif defined(OS_IOS)
- #include "sync/util/get_session_name_ios.h"
-@@ -50,7 +50,7 @@
-       session_name = "Chromebook";
-       break;
-   }
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   session_name = internal::GetHostname();
- #elif defined(OS_IOS)
-   session_name = internal::GetComputerName();
diff --git a/www/chromium/files/patch-sync__util__get_session_name_linux.cc b/www/chromium/files/patch-sync__util__get_session_name_linux.cc
deleted file mode 100644
index 4f7f5de68fb5..000000000000
--- a/www/chromium/files/patch-sync__util__get_session_name_linux.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- sync/util/get_session_name_linux.cc.orig	2014-10-10 08:54:17 UTC
-+++ sync/util/get_session_name_linux.cc
-@@ -13,8 +13,9 @@
- namespace internal {
- 
- std::string GetHostname() {
--  char hostname[HOST_NAME_MAX];
--  if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
-+  int len = sysconf(_SC_HOST_NAME_MAX);
-+  char hostname[len];
-+  if (gethostname(hostname, len) == 0)  // Success.
-     return hostname;
-   return base::GetLinuxDistro();
- }
diff --git a/www/chromium/files/patch-sync_util_get__session__name.cc b/www/chromium/files/patch-sync_util_get__session__name.cc
new file mode 100644
index 000000000000..8737638f1a5d
--- /dev/null
+++ b/www/chromium/files/patch-sync_util_get__session__name.cc
@@ -0,0 +1,20 @@
+--- sync/util/get_session_name.cc.orig	2016-03-25 13:04:51 UTC
++++ sync/util/get_session_name.cc
+@@ -15,7 +15,7 @@
+ 
+ #if defined(OS_CHROMEOS)
+ #include "chromeos/system/devicetype.h"
+-#elif defined(OS_LINUX)
++#elif (defined(OS_LINUX) || defined(OS_BSD))
+ #include "sync/util/get_session_name_linux.h"
+ #elif defined(OS_IOS)
+ #include "sync/util/get_session_name_ios.h"
+@@ -51,7 +51,7 @@ std::string GetSessionNameSynchronously(
+       session_name = "Chromebook";
+       break;
+   }
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   session_name = internal::GetHostname();
+ #elif defined(OS_IOS)
+   session_name = internal::GetComputerName();
diff --git a/www/chromium/files/patch-sync_util_get__session__name__linux.cc b/www/chromium/files/patch-sync_util_get__session__name__linux.cc
new file mode 100644
index 000000000000..0cfde4554c97
--- /dev/null
+++ b/www/chromium/files/patch-sync_util_get__session__name__linux.cc
@@ -0,0 +1,14 @@
+--- sync/util/get_session_name_linux.cc.orig	2016-03-25 13:04:51 UTC
++++ sync/util/get_session_name_linux.cc
+@@ -13,8 +13,9 @@ namespace syncer {
+ namespace internal {
+ 
+ std::string GetHostname() {
+-  char hostname[HOST_NAME_MAX];
+-  if (gethostname(hostname, HOST_NAME_MAX) == 0)  // Success.
++  int len = sysconf(_SC_HOST_NAME_MAX);
++  char hostname[len];
++  if (gethostname(hostname, len) == 0)  // Success.
+     return hostname;
+   return base::GetLinuxDistro();
+ }
diff --git a/www/chromium/files/patch-testing__gtest__src__gtest.cc b/www/chromium/files/patch-testing__gtest__src__gtest.cc
deleted file mode 100644
index cbdab15180ca..000000000000
--- a/www/chromium/files/patch-testing__gtest__src__gtest.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- testing/gtest/src/gtest.cc.orig	2014-10-10 09:15:35 UTC
-+++ testing/gtest/src/gtest.cc
-@@ -121,6 +121,10 @@
- 
- #endif  // GTEST_OS_LINUX
- 
-+#if GTEST_OS_FREEBSD
-+# include <sys/socket.h>
-+#endif
-+
- #if GTEST_HAS_EXCEPTIONS
- # include <stdexcept>
- #endif
-@@ -1891,7 +1895,7 @@
- 
- #if GTEST_OS_WINDOWS
-   return _wcsicmp(lhs, rhs) == 0;
--#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
-+#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID && !GTEST_OS_FREEBSD
-   return wcscasecmp(lhs, rhs) == 0;
- #else
-   // Android, Mac OS X and Cygwin don't define wcscasecmp.
diff --git a/www/chromium/files/patch-testing_gtest_src_gtest.cc b/www/chromium/files/patch-testing_gtest_src_gtest.cc
new file mode 100644
index 000000000000..71cc8e2ad44d
--- /dev/null
+++ b/www/chromium/files/patch-testing_gtest_src_gtest.cc
@@ -0,0 +1,22 @@
+--- testing/gtest/src/gtest.cc.orig	2016-05-11 19:03:10 UTC
++++ testing/gtest/src/gtest.cc
+@@ -122,6 +122,10 @@
+ 
+ #endif  // GTEST_OS_LINUX
+ 
++#if GTEST_OS_FREEBSD
++# include <sys/socket.h>
++#endif
++
+ #if GTEST_HAS_EXCEPTIONS
+ # include <stdexcept>
+ #endif
+@@ -1930,7 +1934,7 @@ bool String::CaseInsensitiveWideCStringE
+ 
+ #if GTEST_OS_WINDOWS
+   return _wcsicmp(lhs, rhs) == 0;
+-#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID
++#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID && !GTEST_OS_FREEBSD
+   return wcscasecmp(lhs, rhs) == 0;
+ #else
+   // Android, Mac OS X and Cygwin don't define wcscasecmp.
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp b/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
new file mode 100644
index 000000000000..722bde3bc700
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_bindings_core_v8_V8ScriptRunner.cpp
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig	2016-05-11 19:02:30 UTC
++++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp
+@@ -44,6 +44,8 @@
+ 
+ #if OS(WIN)
+ #include <malloc.h>
++#elif OS(FREEBSD)
++#include <stdlib.h>
+ #else
+ #include <alloca.h>
+ #endif
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp b/www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp
new file mode 100644
index 000000000000..43e86331b281
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_core_core.gyp
@@ -0,0 +1,20 @@
+--- third_party/WebKit/Source/core/core.gyp.orig	2016-05-11 19:02:30 UTC
++++ third_party/WebKit/Source/core/core.gyp
+@@ -367,7 +367,7 @@
+             'layout/LayoutThemeMac.mm',
+           ],
+         }],
+-        ['OS != "linux"', {
++        ['OS != "linux" and os_bsd != 1', {
+           'sources!': [
+             'layout/LayoutThemeLinux.cpp',
+             'layout/LayoutThemeLinux.h',
+@@ -644,7 +644,7 @@
+                 'layout/LayoutThemeMac.mm',
+               ],
+             }],
+-            ['OS != "linux"', {
++            ['OS != "linux" and OS != "openbsd" and OS != "freebsd"', {
+               'sources!': [
+                 'layout/LayoutThemeLinux.cpp',
+                 'layout/LayoutThemeLinux.h',
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp b/www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp
new file mode 100644
index 000000000000..0b49ff6cd7ff
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_blink__platform.gyp
@@ -0,0 +1,42 @@
+--- third_party/WebKit/Source/platform/blink_platform.gyp.orig	2016-05-25 15:01:11.000000000 -0400
++++ third_party/WebKit/Source/platform/blink_platform.gyp	2016-05-27 12:20:28.640442000 -0400
+@@ -38,6 +38,9 @@
+   'targets': [{
+     'target_name': 'blink_common',
+     'type': '<(component)',
++    'include_dirs': [
++      '<(prefix_dir)/include',
++    ],
+     'variables': { 'enable_wexit_time_destructors': 1 },
+     'dependencies': [
+       '../config.gyp:config',
+@@ -222,7 +225,7 @@
+           ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'],
+         ],
+       }],
+-      ['OS=="linux" or OS=="android"', {
++      ['OS=="linux" or OS=="android" or os_bsd==1', {
+         'sources/': [
+           ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
+         ]
+@@ -301,7 +304,7 @@
+           ['exclude', 'scroll/ScrollbarThemeMac'],
+         ],
+       }],
+-      ['OS != "linux" and OS != "mac" and OS != "win"', {
++      ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', {
+         'sources/': [
+           ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
+         ],
+@@ -347,6 +350,11 @@
+           ['exclude', 'scroll/ScrollbarThemeAura\\.(cpp|h)'],
+         ],
+       }],
++      ['use_system_icu==1', {
++        'defines': [
++          'USING_SYSTEM_ICU',
++        ],
++      }],
+       ['"WTF_USE_WEBAUDIO_FFMPEG=1" in feature_defines', {
+         'include_dirs': [
+           '<(DEPTH)/third_party/ffmpeg',
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
new file mode 100644
index 000000000000..6775d378a057
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.cpp
@@ -0,0 +1,18 @@
+--- third_party/WebKit/Source/platform/fonts/FontCache.cpp.orig	2016-05-27 10:30:48.384014000 -0400
++++ third_party/WebKit/Source/platform/fonts/FontCache.cpp	2016-05-27 10:31:19.845787000 -0400
+@@ -59,13 +59,13 @@
+ 
+ namespace blink {
+ 
+-#if !OS(WIN) && !OS(LINUX)
++#if !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD)
+ FontCache::FontCache()
+     : m_purgePreventCount(0)
+     , m_fontManager(nullptr)
+ {
+ }
+-#endif // !OS(WIN) && !OS(LINUX)
++#endif // !OS(WIN) && !OS(LINUX) && !OS(FREEBSD) && !OS(OPENBSD)
+ 
+ typedef HashMap<FontCacheKey, OwnPtr<FontPlatformData>, FontCacheKeyHash, FontCacheKeyTraits> FontPlatformDataCache;
+ typedef HashMap<FallbackListCompositeKey, OwnPtr<ShapeCache>, FallbackListCompositeKeyHash, FallbackListCompositeKeyTraits> FallbackListShaperCache;
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
new file mode 100644
index 000000000000..43e546f7c444
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_FontCache.h
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/platform/fonts/FontCache.h.orig	2016-05-27 10:32:12.763971000 -0400
++++ third_party/WebKit/Source/platform/fonts/FontCache.h	2016-05-27 10:32:30.876177000 -0400
+@@ -174,7 +174,7 @@
+     // Implemented on skia platforms.
+     PassRefPtr<SkTypeface> createTypeface(const FontDescription&, const FontFaceCreationParams&, CString& name);
+ 
+-#if OS(ANDROID) || OS(LINUX)
++#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD) || OS(OPENBSD)
+     static AtomicString getFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, FontFallbackPriority);
+ #endif
+ 
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
new file mode 100644
index 000000000000..269befb980ce
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_fonts_skia_FontCacheSkia.cpp
@@ -0,0 +1,29 @@
+--- third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp.orig	2016-05-25 15:01:11.000000000 -0400
++++ third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp	2016-05-27 11:26:01.202711000 -0400
+@@ -60,7 +60,7 @@
+ 
+ namespace blink {
+ 
+-#if OS(ANDROID) || OS(LINUX)
++#if OS(ANDROID) || OS(LINUX) || OS(FREEBSD)
+ // Android special locale for retrieving the color emoji font
+ // based on the proposed changes in UTR #51 for introducing
+ // an Emoji script code:
+@@ -171,7 +171,7 @@
+     return fontDataFromFontPlatformData(fontPlatformData, shouldRetain);
+ }
+ 
+-#if OS(WIN) || OS(LINUX)
++#if OS(WIN) || OS(LINUX) || OS(FREEBSD)
+ static inline SkFontStyle fontStyle(const FontDescription& fontDescription)
+ {
+     int width = static_cast<int>(fontDescription.stretch());
+@@ -232,7 +232,7 @@
+     }
+ #endif
+ 
+-#if OS(LINUX)
++#if OS(LINUX) || OS(FREEBSD)
+     // On linux if the fontManager has been overridden then we should be calling the embedder
+     // provided font Manager rather than calling SkTypeface::CreateFromName which may redirect the
+     // call to the default font Manager.
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
new file mode 100644
index 000000000000..c3e5cef85b55
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_GCInfo.cpp
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig	2016-04-08 16:02:13 UTC
++++ third_party/WebKit/Source/platform/heap/GCInfo.cpp
+@@ -7,6 +7,8 @@
+ #include "platform/heap/Handle.h"
+ #include "platform/heap/Heap.h"
+ 
++#include <stdlib.h>
++
+ namespace blink {
+ 
+ // GCInfo indices start from 1 for heap objects, with 0 being treated
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
new file mode 100644
index 000000000000..53015bf9f805
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_heap_StackFrameDepth.cpp
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2016-05-11 19:02:33 UTC
++++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp
+@@ -6,6 +6,8 @@
+ 
+ #include "public/platform/Platform.h"
+ 
++#include <pthread_np.h>
++
+ #if OS(WIN)
+ #include <stddef.h>
+ #include <windows.h>
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp
new file mode 100644
index 000000000000..51fe19ef8bc1
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_image-decoders_png_PNGImageDecoder.cpp
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp.orig	2016-05-27 18:46:06.992656000 -0400
++++ third_party/WebKit/Source/platform/image-decoders/png/PNGImageDecoder.cpp	2016-05-27 18:46:37.983471000 -0400
+@@ -234,7 +234,7 @@
+ #endif
+             png_uint_32 profileLength = 0;
+             if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
+-                setColorProfileAndTransform(profile, profileLength, imageHasAlpha, false /* useSRGB */);
++                setColorProfileAndTransform(reinterpret_cast<const char*>(profile), profileLength, imageHasAlpha, false /* useSRGB */);
+             }
+         }
+ #endif // PNG_iCCP_SUPPORTED
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp
new file mode 100644
index 000000000000..7133ab438c4a
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_Character.cpp
@@ -0,0 +1,22 @@
+--- third_party/WebKit/Source/platform/text/Character.cpp.orig	2016-05-27 12:28:21.057082000 -0400
++++ third_party/WebKit/Source/platform/text/Character.cpp	2016-05-27 18:52:20.104602000 -0400
+@@ -36,8 +36,8 @@
+ #include <unicode/uobject.h>
+ #include <unicode/uscript.h>
+ 
+-#if defined(USING_SYSTEM_ICU)
+-#include "platform/fonts/CharacterPropertyDataGenerator.h"
++#if defined(__FreeBSD__)
++#include "platform/text/CharacterPropertyDataGenerator.h"
+ #include <unicode/uniset.h>
+ #else
+ #define MUTEX_H // Prevent compile failure of utrie2.h on Windows
+@@ -49,7 +49,7 @@
+ 
+ namespace blink {
+ 
+-#if defined(USING_SYSTEM_ICU)
++#if defined(__FreeBSD__)
+ static icu::UnicodeSet* createUnicodeSet(
+     const UChar32* characters, size_t charactersCount,
+     const UChar32* ranges, size_t rangesCount)
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp
new file mode 100644
index 000000000000..25416db38d88
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_platform_text_CharacterPropertyDataGenerator.cpp
@@ -0,0 +1,17 @@
+--- third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp.orig	2016-05-27 12:26:56.689563000 -0400
++++ third_party/WebKit/Source/platform/text/CharacterPropertyDataGenerator.cpp	2016-05-27 12:27:22.119336000 -0400
+@@ -11,12 +11,12 @@
+ #include <cassert>
+ #include <cstring>
+ #include <stdio.h>
+-#if !defined(USING_SYSTEM_ICU)
++#if !defined(__FreeBSD__)
+ #define MUTEX_H // Prevent compile failure of utrie2.h on Windows
+ #include <utrie2.h>
+ #endif
+ 
+-#if defined(USING_SYSTEM_ICU)
++#if defined(__FreeBSD__)
+ static void generate(FILE*)
+ {
+ }
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp b/www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp
new file mode 100644
index 000000000000..bfa20a2d99ad
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_web_web.gyp
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/web/web.gyp.orig	2016-05-11 19:02:33 UTC
++++ third_party/WebKit/Source/web/web.gyp
+@@ -160,7 +160,7 @@
+                         '../core/core.gyp:webcore',
+                      ],
+                 }],
+-                ['OS == "linux"', {
++                ['OS == "linux" or os_bsd == 1', {
+                     'dependencies': [
+                         '<(DEPTH)/build/linux/system.gyp:fontconfig',
+                     ],
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
new file mode 100644
index 000000000000..db652cd46cfe
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_ByteSwap.h
@@ -0,0 +1,18 @@
+--- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2016-03-25 13:05:01 UTC
++++ third_party/WebKit/Source/wtf/ByteSwap.h
+@@ -52,9 +52,15 @@ ALWAYS_INLINE uint16_t bswap16(uint16_t 
+ 
+ #else
+ 
++#ifndef bswap64
+ ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); }
++#endif
++#ifndef bswap32
+ ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); }
++#endif
++#ifndef bswap16
+ ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); }
++#endif
+ 
+ #endif
+ 
diff --git a/www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp b/www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp
new file mode 100644
index 000000000000..2e6cf99cc709
--- /dev/null
+++ b/www/chromium/files/patch-third__party_WebKit_Source_wtf_wtf.gyp
@@ -0,0 +1,11 @@
+--- third_party/WebKit/Source/wtf/wtf.gyp.orig	2016-03-25 13:05:01 UTC
++++ third_party/WebKit/Source/wtf/wtf.gyp
+@@ -57,7 +57,7 @@
+       'target_name': 'wtf',
+       'type': '<(component)',
+       'include_dirs': [
+-        '..',
++        '..', '<(prefix_dir)/include',
+       ],
+       'dependencies': [
+           'wtf_config',
diff --git a/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
new file mode 100644
index 000000000000..64226959ced6
--- /dev/null
+++ b/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h
@@ -0,0 +1,11 @@
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig	2016-05-27 10:36:15.803726000 -0400
++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h	2016-05-27 10:36:39.406818000 -0400
+@@ -56,7 +56,7 @@
+ #include "phonenumbers/base/logging.h"
+ #include "phonenumbers/base/thread_checker.h"
+ 
+-#if !defined(__linux__) && !defined(__APPLE__)
++#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ 
+ namespace i18n {
+ namespace phonenumbers {
diff --git a/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
new file mode 100644
index 000000000000..15f189b0709f
--- /dev/null
+++ b/www/chromium/files/patch-third__party__libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h
@@ -0,0 +1,11 @@
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig	2016-05-27 10:37:19.349853000 -0400
++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h	2016-05-27 10:37:52.605308000 -0400
+@@ -37,7 +37,7 @@
+ // Dummy lock implementation on non-POSIX platforms. If you are running on a
+ // different platform and care about thread-safety, please compile with
+ // -DI18N_PHONENUMBERS_USE_BOOST.
+-#if !defined(__linux__) && !defined(__APPLE__)
++#if !defined(__linux__) && !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
+ 
+ namespace i18n {
+ namespace phonenumbers {
diff --git a/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h
new file mode 100644
index 000000000000..3ba9b44f8b14
--- /dev/null
+++ b/www/chromium/files/patch-third__party_cacheinvalidation_src_google_cacheinvalidation_include_types.h
@@ -0,0 +1,11 @@
+--- third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h.orig	2016-05-20 23:45:41 UTC
++++ third_party/cacheinvalidation/src/google/cacheinvalidation/include/types.h
+@@ -334,6 +334,8 @@ class Status {
+      */
+     PERMANENT_FAILURE
+   };
++  
++  Status() : code_(SUCCESS), message_() {}
+ 
+   /* Creates a new Status object given the code and message. */
+   Status(Code code, const string& message) : code_(code), message_(message) {}
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py
new file mode 100644
index 000000000000..e77bf709f5fb
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_scripts_generate__gyp.py
@@ -0,0 +1,20 @@
+--- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2016-05-11 19:03:23 UTC
++++ third_party/ffmpeg/chromium/scripts/generate_gyp.py
+@@ -43,6 +43,8 @@ import sys
+ COPYRIGHT = """# Copyright %d 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.
++#
++# modified: cmt@burggraben.net
+ 
+ # NOTE: this file is autogenerated by ffmpeg/chromium/scripts/generate_gyp.py
+ 
+@@ -372,6 +374,8 @@ class SourceSet(object):
+ 
+       if condition.PLATFORM == '*':
+         platform_condition = None
++      elif condition.PLATFORM == 'linux':
++        platform_condition = '(OS == "%s" or os_bsd == 1)' % condition.PLATFORM
+       else:
+         platform_condition = 'OS == "%s"' % condition.PLATFORM
+ 
diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
new file mode 100644
index 000000000000..5b9045a804c7
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gni
@@ -0,0 +1,319 @@
+--- third_party/ffmpeg/ffmpeg_generated.gni.orig	2016-05-11 19:03:23 UTC
++++ third_party/ffmpeg/ffmpeg_generated.gni
+@@ -12,7 +12,7 @@ ffmpeg_c_sources = []
+ ffmpeg_gas_sources = []
+ ffmpeg_yasm_sources = []
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
+   ffmpeg_c_sources += [
+     "libavcodec/allcodecs.c",
+     "libavcodec/autorename_libavcodec_utils.c",
+@@ -144,7 +144,7 @@ if ((is_android && current_cpu == "arm" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
+   ffmpeg_c_sources += [
+     "libavcodec/h264pred.c",
+     "libavcodec/hpeldsp.c",
+@@ -159,13 +159,13 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavformat/rawdec.c",
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/aac_ac3_parser.c",
+     "libavcodec/aac_parser.c",
+@@ -207,7 +207,7 @@ if ((is_android && current_cpu == "arm" 
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
+     "libavcodec/x86/constants.c",
+@@ -218,7 +218,7 @@ if ((is_android && current_cpu == "x64" 
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
+   ffmpeg_yasm_sources += [
+     "libavcodec/x86/fft.asm",
+     "libavcodec/x86/vorbisdsp.asm",
+@@ -228,7 +228,7 @@ if ((is_android && current_cpu == "x64" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/cabac.c",
+     "libavcodec/h264.c",
+@@ -251,7 +251,7 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/fft_fixed_init_arm.c",
+     "libavcodec/arm/fft_init_arm.c",
+@@ -267,7 +267,7 @@ if ((is_android && current_cpu == "arm" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/flac.c",
+     "libavcodec/flac_parser.c",
+@@ -278,7 +278,7 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/h264pred_init_arm.c",
+     "libavcodec/arm/hpeldsp_init_arm.c",
+@@ -298,7 +298,7 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavutil/arm/float_dsp_init_neon.c",
+   ]
+@@ -313,7 +313,7 @@ if ((is_android && current_cpu == "arm" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
+     "libavcodec/x86/h264_intrapred_init.c",
+@@ -333,13 +333,13 @@ if ((is_linux && current_cpu == "x64" &&
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
++if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavutil/mips/float_dsp_mips.c",
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/aacpsdsp_init.c",
+     "libavcodec/x86/dct_init.c",
+@@ -348,7 +348,7 @@ if ((is_android && current_cpu == "x64" 
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+   ffmpeg_yasm_sources += [
+     "libavcodec/x86/aacpsdsp.asm",
+     "libavcodec/x86/dct32.asm",
+@@ -357,7 +357,7 @@ if ((is_android && current_cpu == "x64" 
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/aacpsdsp_init_arm.c",
+     "libavcodec/arm/mpegaudiodsp_init_arm.c",
+@@ -368,7 +368,7 @@ if ((is_android && current_cpu == "arm" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/acelp_filters.c",
+     "libavcodec/acelp_pitch_delay.c",
+@@ -423,7 +423,7 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/mips/h264pred_init_mips.c",
+     "libavcodec/mips/hpeldsp_init_mips.c",
+@@ -431,7 +431,7 @@ if ((is_linux && current_cpu == "mipsel"
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/aarch64/fft_init_aarch64.c",
+     "libavcodec/aarch64/vorbisdsp_init.c",
+@@ -446,7 +446,7 @@ if ((is_android && current_cpu == "arm64
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/aarch64/h264pred_init.c",
+     "libavcodec/aarch64/hpeldsp_init_aarch64.c",
+@@ -459,7 +459,7 @@ if ((is_linux && current_cpu == "arm64" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/flacdsp_init_arm.c",
+   ]
+@@ -468,7 +468,7 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/h264chroma_init_arm.c",
+     "libavcodec/arm/h264dsp_init_arm.c",
+@@ -479,7 +479,7 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/hpeldsp_init_neon.c",
+     "libavcodec/arm/vp8dsp_init_neon.c",
+@@ -492,14 +492,14 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
++if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_gas_sources += [
+     "libavcodec/arm/aacpsdsp_neon.S",
+     "libavcodec/arm/sbrdsp_neon.S",
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/h264_qpel.c",
+     "libavcodec/x86/h264chroma_init.c",
+@@ -520,7 +520,7 @@ if ((is_linux && current_cpu == "x64" &&
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
++if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/mips/aacdec_mips.c",
+     "libavcodec/mips/aacpsdsp_mips.c",
+@@ -529,7 +529,7 @@ if ((is_android && current_cpu == "mips6
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/flacdsp_init.c",
+   ]
+@@ -544,7 +544,7 @@ if ((is_win && current_cpu == "x64" && f
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/mips/h264chroma_init_mips.c",
+     "libavcodec/mips/h264dsp_init_mips.c",
+@@ -552,7 +552,7 @@ if ((is_linux && current_cpu == "mipsel"
+   ]
+ }
+ 
+-if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
++if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/aarch64/imdct15_init.c",
+     "libavcodec/aarch64/mpegaudiodsp_init.c",
+@@ -563,7 +563,7 @@ if ((is_android && current_cpu == "arm64
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/aarch64/h264chroma_init_aarch64.c",
+     "libavcodec/aarch64/h264dsp_init_aarch64.c",
+@@ -577,7 +577,7 @@ if ((is_linux && current_cpu == "arm64" 
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/blockdsp_init_arm.c",
+     "libavcodec/arm/idctdsp_init_arm.c",
+@@ -601,13 +601,13 @@ if ((is_linux && current_cpu == "arm" &&
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c",
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_gas_sources += [
+     "libavcodec/arm/h264cmc_neon.S",
+     "libavcodec/arm/h264dsp_neon.S",
+@@ -622,7 +622,7 @@ if ((is_win && current_cpu == "x64" && f
+   ]
+ }
+ 
+-if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
++if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
+   ffmpeg_c_sources += [
+     "libavcodec/x86/blockdsp_init.c",
+     "libavcodec/x86/fdct.c",
+@@ -649,7 +649,7 @@ if ((is_linux && current_cpu == "x64" &&
+   ]
+ }
+ 
+-if (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") {
++if ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") {
+   ffmpeg_c_sources += [
+     "libavcodec/mips/blockdsp_init_mips.c",
+     "libavcodec/mips/h263dsp_init_mips.c",
+@@ -662,7 +662,7 @@ if (is_linux && current_cpu == "mipsel" 
+   ]
+ }
+ 
+-if (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") {
++if ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") {
+   ffmpeg_c_sources += [
+     "libavcodec/arm/blockdsp_init_neon.c",
+     "libavcodec/arm/idctdsp_init_neon.c",
diff --git a/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi
new file mode 100644
index 000000000000..d7c1c1d7c17a
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ffmpeg_ffmpeg__generated.gypi
@@ -0,0 +1,395 @@
+--- third_party/ffmpeg/ffmpeg_generated.gypi.orig	2016-05-11 19:03:23 UTC
++++ third_party/ffmpeg/ffmpeg_generated.gypi
+@@ -8,7 +8,7 @@
+ {
+   'variables': {
+     'conditions': [
+-      ['OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', {
++      ['(OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', {
+         'c_sources': [
+           'libavcodec/arm/blockdsp_init_neon.c',
+           'libavcodec/arm/idctdsp_init_neon.c',
+@@ -19,8 +19,8 @@
+           'libavcodec/arm/mpegvideo_neon.S',
+           'libavcodec/arm/simple_idct_neon.S',
+         ],
+-      }],  # OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"
+-      ['OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', {
++      }],  # (OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"
++      ['(OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', {
+         'c_sources': [
+           'libavcodec/mips/blockdsp_init_mips.c',
+           'libavcodec/mips/h263dsp_init_mips.c',
+@@ -31,8 +31,8 @@
+           'libavcodec/mips/qpeldsp_init_mips.c',
+           'libavcodec/mips/xvididct_init_mips.c',
+         ],
+-      }],  # OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/x86/blockdsp_init.c',
+           'libavcodec/x86/fdct.c',
+@@ -57,26 +57,26 @@
+           'libavcodec/x86/simple_idct10.asm',
+           'libavcodec/x86/xvididct.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
+       ['(OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'asm_sources': [
+           'libavutil/x86/emms.asm',
+         ],
+       }],  # (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
+         'asm_sources': [
+           'libavcodec/arm/h264cmc_neon.S',
+           'libavcodec/arm/h264dsp_neon.S',
+           'libavcodec/arm/h264idct_neon.S',
+           'libavcodec/arm/h264qpel_neon.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/arm/blockdsp_init_arm.c',
+           'libavcodec/arm/idctdsp_init_arm.c',
+@@ -98,8 +98,8 @@
+           'libavcodec/arm/simple_idct_armv5te.S',
+           'libavcodec/arm/simple_idct_armv6.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/aarch64/h264chroma_init_aarch64.c',
+           'libavcodec/aarch64/h264dsp_init_aarch64.c',
+@@ -111,8 +111,8 @@
+           'libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S',
+           'libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/aarch64/imdct15_init.c',
+           'libavcodec/aarch64/mpegaudiodsp_init.c',
+@@ -121,36 +121,36 @@
+           'libavcodec/aarch64/imdct15_neon.S',
+           'libavcodec/aarch64/mpegaudiodsp_neon.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
++      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/mips/h264chroma_init_mips.c',
+           'libavcodec/mips/h264dsp_init_mips.c',
+           'libavcodec/mips/h264qpel_init_mips.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
+       ['(OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'c_sources': [
+           'compat/msvcrt/snprintf.c',
+         ],
+       }],  # (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/x86/flacdsp_init.c',
+         ],
+         'asm_sources': [
+           'libavcodec/x86/flacdsp.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
++      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/mips/aacdec_mips.c',
+           'libavcodec/mips/aacpsdsp_mips.c',
+           'libavcodec/mips/aacsbr_mips.c',
+           'libavcodec/mips/sbrdsp_mips.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/x86/h264_qpel.c',
+           'libavcodec/x86/h264chroma_init.c',
+@@ -169,14 +169,14 @@
+           'libavcodec/x86/h264_weight_10bit.asm',
+           'libavcodec/x86/qpel.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
+         'asm_sources': [
+           'libavcodec/arm/aacpsdsp_neon.S',
+           'libavcodec/arm/sbrdsp_neon.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/arm/hpeldsp_init_neon.c',
+           'libavcodec/arm/vp8dsp_init_neon.c',
+@@ -187,8 +187,8 @@
+           'libavcodec/arm/vp3dsp_neon.S',
+           'libavcodec/arm/vp8dsp_neon.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/arm/h264chroma_init_arm.c',
+           'libavcodec/arm/h264dsp_init_arm.c',
+@@ -197,16 +197,16 @@
+         'asm_sources': [
+           'libavcodec/arm/startcode_armv6.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/arm/flacdsp_init_arm.c',
+         ],
+         'asm_sources': [
+           'libavcodec/arm/flacdsp_arm.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/aarch64/h264pred_init.c',
+           'libavcodec/aarch64/hpeldsp_init_aarch64.c',
+@@ -217,8 +217,8 @@
+           'libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S',
+           'libavcodec/aarch64/videodsp.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
++      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/aarch64/fft_init_aarch64.c',
+           'libavcodec/aarch64/vorbisdsp_init.c',
+@@ -231,15 +231,15 @@
+           'libavcodec/aarch64/vorbisdsp_neon.S',
+           'libavutil/aarch64/float_dsp_neon.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/mips/h264pred_init_mips.c',
+           'libavcodec/mips/hpeldsp_init_mips.c',
+           'libavcodec/mips/vp8dsp_init_mips.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/acelp_filters.c',
+           'libavcodec/acelp_pitch_delay.c',
+@@ -292,8 +292,8 @@
+           'libavformat/avidec.c',
+           'libavformat/gsmdec.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
+         'c_sources': [
+           'libavcodec/arm/aacpsdsp_init_arm.c',
+           'libavcodec/arm/mpegaudiodsp_init_arm.c',
+@@ -302,29 +302,29 @@
+         'asm_sources': [
+           'libavcodec/arm/mpegaudiodsp_fixed_armv6.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
+-      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
++      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
+         'asm_sources': [
+           'libavcodec/x86/aacpsdsp.asm',
+           'libavcodec/x86/dct32.asm',
+           'libavcodec/x86/imdct36.asm',
+           'libavcodec/x86/sbrdsp.asm',
+         ],
+-      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+-      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
++      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/x86/aacpsdsp_init.c',
+           'libavcodec/x86/dct_init.c',
+           'libavcodec/x86/mpegaudiodsp.c',
+           'libavcodec/x86/sbrdsp_init.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+-      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
++      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavutil/mips/float_dsp_mips.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'c_sources': [
+           'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c',
+           'libavcodec/x86/h264_intrapred_init.c',
+@@ -342,8 +342,8 @@
+           'libavcodec/x86/vp8dsp.asm',
+           'libavcodec/x86/vp8dsp_loopfilter.asm',
+         ],
+-      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavutil/arm/float_dsp_init_neon.c',
+         ],
+@@ -356,8 +356,8 @@
+           'libavcodec/arm/rdft_neon.S',
+           'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/arm/h264pred_init_arm.c',
+           'libavcodec/arm/hpeldsp_init_arm.c',
+@@ -375,8 +375,8 @@
+           'libavcodec/arm/vp8_armv6.S',
+           'libavcodec/arm/vp8dsp_armv6.S',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/flac.c',
+           'libavcodec/flac_parser.c',
+@@ -385,8 +385,8 @@
+           'libavcodec/flacdsp.c',
+           'libavformat/autorename_libavformat_flacdec.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
+         'c_sources': [
+           'libavcodec/arm/fft_fixed_init_arm.c',
+           'libavcodec/arm/fft_init_arm.c',
+@@ -400,8 +400,8 @@
+           'libavcodec/arm/mdct_vfp.S',
+           'libavutil/arm/float_dsp_vfp.S',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/cabac.c',
+           'libavcodec/h264.c',
+@@ -422,8 +422,8 @@
+           'libavcodec/h264qpel.c',
+           'libavcodec/startcode.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+-      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
++      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'asm_sources': [
+           'libavcodec/x86/fft.asm',
+           'libavcodec/x86/vorbisdsp.asm',
+@@ -431,8 +431,8 @@
+           'libavutil/x86/float_dsp.asm',
+           'libavutil/x86/lls.asm',
+         ],
+-      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+-      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
++      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'c_sources': [
+           'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c',
+           'libavcodec/x86/constants.c',
+@@ -441,13 +441,13 @@
+           'libavutil/x86/autorename_libavutil_x86_float_dsp_init.c',
+           'libavutil/x86/lls_init.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
++      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+       ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'c_sources': [
+           'compat/strtod.c',
+         ],
+       }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavcodec/aac_ac3_parser.c',
+           'libavcodec/aac_parser.c',
+@@ -481,13 +481,13 @@
+           'libavformat/mov_chan.c',
+           'libavformat/mp3dec.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
+         'c_sources': [
+           'libavformat/rawdec.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
+-      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
++      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'c_sources': [
+           'libavcodec/h264pred.c',
+           'libavcodec/hpeldsp.c',
+@@ -500,8 +500,8 @@
+           'libavcodec/vp8_parser.c',
+           'libavcodec/vp8dsp.c',
+         ],
+-      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+-      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
++      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
++      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
+         'c_sources': [
+           'libavcodec/allcodecs.c',
+           'libavcodec/autorename_libavcodec_utils.c',
+@@ -631,7 +631,7 @@
+           'libavutil/twofish.c',
+           'libavutil/utils.c',
+         ],
+-      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
++      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
+     ],  # conditions
+   },
+ }
diff --git a/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
new file mode 100644
index 000000000000..dae3c972ddbb
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ffmpeg_libavutil_mem.c
@@ -0,0 +1,11 @@
+--- third_party/ffmpeg/libavutil/mem.c.orig	2016-05-11 19:03:23 UTC
++++ third_party/ffmpeg/libavutil/mem.c
+@@ -32,7 +32,7 @@
+ #include <stdint.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#if HAVE_MALLOC_H
++#if HAVE_MALLOC_H && !defined(__FreeBSD__)
+ #include <malloc.h>
+ #endif
+ 
diff --git a/www/chromium/files/patch-third__party_flac_flac.gyp b/www/chromium/files/patch-third__party_flac_flac.gyp
new file mode 100644
index 000000000000..735b7cdd1768
--- /dev/null
+++ b/www/chromium/files/patch-third__party_flac_flac.gyp
@@ -0,0 +1,116 @@
+--- third_party/flac/flac.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/flac/flac.gyp
+@@ -1,4 +1,4 @@
+-# Copyright (c) 2011 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+@@ -6,85 +6,32 @@
+   'targets': [
+     {
+       'target_name': 'libflac',
+-      'product_name': 'flac',
+-      'type': 'static_library',
+-      'sources': [
+-        'include/FLAC/all.h',
+-        'include/FLAC/assert.h',
+-        'include/FLAC/callback.h',
+-        'include/FLAC/export.h',
+-        'include/FLAC/format.h',
+-        'include/FLAC/metadata.h',
+-        'include/FLAC/ordinals.h',
+-        'include/FLAC/stream_decoder.h',
+-        'include/FLAC/stream_encoder.h',
+-        'include/share/alloc.h',
+-        'src/libFLAC/alloc.c',
+-        'src/libFLAC/bitmath.c',
+-        'src/libFLAC/bitreader.c',
+-        'src/libFLAC/bitwriter.c',
+-        'src/libFLAC/cpu.c',
+-        'src/libFLAC/crc.c',
+-        'src/libFLAC/fixed.c',
+-        'src/libFLAC/float.c',
+-        'src/libFLAC/format.c',
+-        'src/libFLAC/lpc.c',
+-        'src/libFLAC/md5.c',
+-        'src/libFLAC/memory.c',
+-        'src/libFLAC/stream_decoder.c',
+-        'src/libFLAC/stream_encoder.c',
+-        'src/libFLAC/stream_encoder_framing.c',
+-        'src/libFLAC/window.c',
+-        'src/libFLAC/include/private/all.h',
+-        'src/libFLAC/include/private/bitmath.h',
+-        'src/libFLAC/include/private/bitreader.h',
+-        'src/libFLAC/include/private/bitwriter.h',
+-        'src/libFLAC/include/private/cpu.h',
+-        'src/libFLAC/include/private/crc.h',
+-        'src/libFLAC/include/private/fixed.h',
+-        'src/libFLAC/include/private/float.h',
+-        'src/libFLAC/include/private/format.h',
+-        'src/libFLAC/include/private/lpc.h',
+-        'src/libFLAC/include/private/md5.h',
+-        'src/libFLAC/include/private/memory.h',
+-        'src/libFLAC/include/private/metadata.h',
+-        'src/libFLAC/include/private/stream_encoder_framing.h',
+-        'src/libFLAC/include/private/window.h',
+-        'src/libFLAC/include/protected/all.h',
+-        'src/libFLAC/include/protected/stream_decoder.h',
+-        'src/libFLAC/include/protected/stream_encoder.h',
+-      ],
+-      'defines': [
+-        'FLAC__NO_DLL',
+-        'FLAC__OVERFLOW_DETECT',
+-        'VERSION="1.2.1"',
+-      ],
+-      'include_dirs': [
+-        'include',
+-        'src/libFLAC/include',
+-      ],
+-      'direct_dependent_settings': {
+-        'defines': [
+-          'FLAC__NO_DLL',
++      'type': 'none',
++      'variables': {
++        'headers_root_path': 'include',
++        'header_filenames': [
++          'FLAC/callback.h',
++          'FLAC/metadata.h',
++          'FLAC/assert.h',
++          'FLAC/export.h',
++          'FLAC/format.h',
++          'FLAC/stream_decoder.h',
++          'FLAC/stream_encoder.h',
++          'FLAC/ordinals.h',
++          'FLAC/all.h',
+         ],
+       },
+-      'variables': {
+-        'clang_warning_flags': [
+-          # libflac converts between FLAC__StreamDecoderState and
+-          # FLAC__StreamDecoderInitStatus a lot in stream_decoder.c.
+-          '-Wno-conversion',
+-          # libflac contains constants that are only used in certain
+-          # compile-time cases, which triggers unused-const-variable warnings in
+-          # other cases.
+-          '-Wno-unused-const-variable',
++      'includes': [
++        '../../build/shim_headers.gypi',
++      ],
++      'link_settings': {
++        'ldflags': [
++          '<!@(pkg-config --libs-only-L --libs-only-other flac)',
++        ],
++        'libraries': [
++          '<!@(pkg-config --libs-only-l flac)',
+         ],
+       },
+     },
+   ],
+ }
+-
+-# Local Variables:
+-# tab-width:2
+-# indent-tabs-mode:nil
+-# End:
+-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp b/www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp
new file mode 100644
index 000000000000..83dae0b715d4
--- /dev/null
+++ b/www/chromium/files/patch-third__party_jsoncpp_jsoncpp.gyp
@@ -0,0 +1,54 @@
+--- third_party/jsoncpp/jsoncpp.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/jsoncpp/jsoncpp.gyp
+@@ -1,21 +1,39 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-  'includes': [
+-    'jsoncpp.gypi',
+-  ],
+   'targets': [
+     {
+       'target_name': 'jsoncpp',
+-      'type': 'static_library',
+-    },
++      'type': 'none',
++      'variables': {
++        'headers_root_path': 'source/include',
++        'header_filenames': [
++          'json/assertions.h',
++          'json/autolink.h',
++          'json/config.h',
++          'json/features.h',
++          'json/forwards.h',
++          'json/json.h',
++          'json/reader.h',
++          'json/value.h',
++          'json/writer.h',
++        ],
++      },
++      'includes': [
++        '../../build/shim_headers.gypi',
++      ],
++      'direct_dependent_settings': {
++        'include_dirs': [
++          '/usr/include/jsoncpp',
++        ],
++      },
++      'link_settings': {
++        'libraries': [
++          '-ljsoncpp',
++        ],
++      },
++    }
+   ],
+ }
+-
+-# Local Variables:
+-# tab-width:2
+-# indent-tabs-mode:nil
+-# End:
+-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/www/chromium/files/patch-third__party_khronos_khronos.gyp b/www/chromium/files/patch-third__party_khronos_khronos.gyp
new file mode 100644
index 000000000000..965773d99807
--- /dev/null
+++ b/www/chromium/files/patch-third__party_khronos_khronos.gyp
@@ -0,0 +1,10 @@
+--- third_party/khronos/khronos.gyp.orig	2016-03-25 13:05:02 UTC
++++ third_party/khronos/khronos.gyp
+@@ -11,6 +11,7 @@
+         'include_dirs': [
+           '.',
+           '../../gpu',  # Contains GLES2/gl2chromium.h
++          '<(prefix_dir)/include',
+         ],
+       },
+     },
diff --git a/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
new file mode 100644
index 000000000000..ecd92f6ea753
--- /dev/null
+++ b/www/chromium/files/patch-third__party_leveldatabase_env__chromium.cc
@@ -0,0 +1,14 @@
+--- third_party/leveldatabase/env_chromium.cc.orig	2016-05-11 19:02:34 UTC
++++ third_party/leveldatabase/env_chromium.cc
+@@ -21,7 +21,11 @@
+ #include "base/threading/thread_restrictions.h"
+ #include "base/trace_event/trace_event.h"
+ #include "third_party/leveldatabase/chromium_logger.h"
++#if defined(OS_BSD)
++#include <re2/re2.h>
++#else
+ #include "third_party/re2/src/re2/re2.h"
++#endif
+ 
+ using base::FilePath;
+ using leveldb::FileLock;
diff --git a/www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp b/www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp
new file mode 100644
index 000000000000..23e519d5ff11
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libXNVCtrl_libXNVCtrl.gyp
@@ -0,0 +1,12 @@
+--- third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2016-03-25 13:05:02 UTC
++++ third_party/libXNVCtrl/libXNVCtrl.gyp
+@@ -13,6 +13,9 @@
+         'NVCtrlLib.h',
+         'nv_control.h',
+       ],
++      'include_dirs': [
++        '<(prefix_dir)/include',
++      ],
+     },
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_libjingle_libjingle.gyp b/www/chromium/files/patch-third__party_libjingle_libjingle.gyp
new file mode 100644
index 000000000000..5a821b0dabcd
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libjingle_libjingle.gyp
@@ -0,0 +1,20 @@
+--- third_party/libjingle/libjingle.gyp.orig	2016-05-25 15:01:12.000000000 -0400
++++ third_party/libjingle/libjingle.gyp	2016-05-27 11:30:30.507965000 -0400
+@@ -121,6 +121,8 @@
+         ['os_bsd==1', {
+           'defines': [
+             'BSD',
++            'WEBRTC_LINUX',
++            'WEBRTC_BSD',
+           ],
+         }],
+         ['OS=="openbsd"', {
+@@ -191,6 +193,8 @@
+       ['os_bsd==1', {
+         'defines': [
+           'BSD',
++          'WEBRTC_LINUX',
++          'WEBRTC_BSD',
+         ],
+       }],
+       ['OS=="openbsd"', {
diff --git a/www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp b/www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp
new file mode 100644
index 000000000000..5011f403fc15
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libjpeg_libjpeg.gyp
@@ -0,0 +1,133 @@
+--- third_party/libjpeg/libjpeg.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/libjpeg/libjpeg.gyp
+@@ -1,109 +1,29 @@
+-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-  # This file handles building both with our local libjpeg and with the system
+-  # libjpeg.
+-  'conditions': [
+-    ['use_system_libjpeg==0', {
+-      'targets': [
+-        {
+-          'target_name': 'libjpeg',
+-          'type': 'static_library',
+-          'defines': [
+-            'NO_GETENV',  # getenv() is not thread-safe.
+-          ],
+-          'sources': [
+-            'jcapimin.c',
+-            'jcapistd.c',
+-            'jccoefct.c',
+-            'jccolor.c',
+-            'jcdctmgr.c',
+-            'jchuff.c',
+-            'jchuff.h',
+-            'jcinit.c',
+-            'jcmainct.c',
+-            'jcmarker.c',
+-            'jcmaster.c',
+-            'jcomapi.c',
+-            'jconfig.h',
+-            'jcparam.c',
+-            'jcphuff.c',
+-            'jcprepct.c',
+-            'jcsample.c',
+-            'jdapimin.c',
+-            'jdapistd.c',
+-            'jdatadst.c',
+-            'jdatasrc.c',
+-            'jdcoefct.c',
+-            'jdcolor.c',
+-            'jdct.h',
+-            'jddctmgr.c',
+-            'jdhuff.c',
+-            'jdhuff.h',
+-            'jdinput.c',
+-            'jdmainct.c',
+-            'jdmarker.c',
+-            'jdmaster.c',
+-            'jdmerge.c',
+-            'jdphuff.c',
+-            'jdpostct.c',
+-            'jdsample.c',
+-            'jerror.c',
+-            'jerror.h',
+-            'jfdctflt.c',
+-            'jfdctfst.c',
+-            'jfdctint.c',
+-            'jidctflt.c',
+-            'jidctfst.c',
+-            'jidctint.c',
+-            'jinclude.h',
+-            'jmemmgr.c',
+-            'jmemnobs.c',
+-            'jmemsys.h',
+-            'jmorecfg.h',
+-            'jpegint.h',
+-            'jpeglib.h',
+-            'jquant1.c',
+-            'jquant2.c',
+-            'jutils.c',
+-            'jversion.h',
+-          ],
+-          'direct_dependent_settings': {
++  'targets': [
++    {
++      'target_name': 'libjpeg',
++      'type': 'none',
++      'direct_dependent_settings': {
++        'defines': [
++          'USE_SYSTEM_LIBJPEG',
++        ],
++        'conditions': [
++          ['os_bsd==1', {
+             'include_dirs': [
+-              '.',
+-            ],
+-          },
+-          'conditions': [
+-            ['OS!="win"', {'product_name': 'jpeg'}],
+-          ],
+-        },
+-      ],
+-    }, {
+-      'targets': [
+-        {
+-          'target_name': 'libjpeg',
+-          'type': 'none',
+-          'direct_dependent_settings': {
+-            'defines': [
+-              'USE_SYSTEM_LIBJPEG',
+-            ],
+-            'conditions': [
+-              ['os_bsd==1', {
+-                'include_dirs': [
+-                  '/usr/local/include',
+-                ],
+-              }],
+-            ],
+-          },
+-          'link_settings': {
+-            'libraries': [
+-              '-ljpeg',
++              '/usr/local/include',
+             ],
+-          },
+-        }
+-      ],
+-    }],
++          }],
++        ],
++      },
++      'link_settings': {
++        'libraries': [
++          '-ljpeg',
++        ],
++      },
++    }
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
new file mode 100644
index 000000000000..742c1ac50441
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h
@@ -0,0 +1,19 @@
+--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig	2016-05-27 10:38:59.514474000 -0400
++++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h	2016-05-27 10:40:19.234261000 -0400
+@@ -23,6 +23,7 @@
+ // user of the library know that it can't be used in a thread-safe manner when
+ // it is not depending on Boost.
+ #if !defined(__linux__) && !defined(__APPLE__) && \
++    !defined(__FreeBSD__) && !defined(__OpenBSD__) && \
+     !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY)
+ #error Building without Boost, please provide \
+        -DI18N_PHONENUMBERS_NO_THREAD_SAFETY
+@@ -31,7 +32,7 @@
+ #endif
+ 
+ #if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \
+-    (defined(__linux__) || defined(__apple__))
++    (defined(__linux__) || defined(__apple__)) || defined(__FreeBSD__) || defined(__OpenBSD__)
+ 
+ #include <pthread.h>
+ 
diff --git a/www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp b/www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp
new file mode 100644
index 000000000000..aeb2d004d93c
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libphonenumber_libphonenumber.gyp
@@ -0,0 +1,10 @@
+--- third_party/libphonenumber/libphonenumber.gyp.orig	2016-05-11 19:02:34 UTC
++++ third_party/libphonenumber/libphonenumber.gyp
+@@ -11,6 +11,7 @@
+       # generated protocol headers to be available with "phonenumbers" include
+       # path, e.g. #include "phonenumbers/foo.pb.h".
+       '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
++      '<(prefix_dir)/include',
+     ],
+     'defines': [
+       'I18N_PHONENUMBERS_USE_ICU_REGEXP=1',
diff --git a/www/chromium/files/patch-third__party_libusb_libusb.gyp b/www/chromium/files/patch-third__party_libusb_libusb.gyp
new file mode 100644
index 000000000000..57989f8c20ee
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libusb_libusb.gyp
@@ -0,0 +1,157 @@
+--- third_party/libusb/libusb.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/libusb/libusb.gyp
+@@ -1,4 +1,4 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+@@ -6,133 +6,29 @@
+   'targets': [
+     {
+       'target_name': 'libusb',
+-      'type': 'static_library',
+-      'sources': [
+-        'src/config.h',
+-        'src/libusb/core.c',
+-        'src/libusb/descriptor.c',
+-        'src/libusb/hotplug.c',
+-        'src/libusb/hotplug.h',
+-        'src/libusb/interrupt.c',
+-        'src/libusb/interrupt.h',
+-        'src/libusb/io.c',
+-        'src/libusb/libusb.h',
+-        'src/libusb/libusbi.h',
+-        'src/libusb/strerror.c',
+-        'src/libusb/sync.c',
+-        'src/libusb/version.h',
+-        'src/libusb/version_nano.h',
+-      ],
++      'type': 'none',
+       'variables': {
+-        'clang_warning_flags': [
+-          # guid_eq in windows_usb.c is unused.
+-          '-Wno-unused-function',
++        'headers_root_path': 'src/libusb',
++        'header_filenames': [
++          'libusb.h',
+         ],
+       },
+-      'include_dirs': [
+-        'src',
+-        'src/libusb',
+-        'src/libusb/os',
++      'includes': [
++        '../../build/shim_headers.gypi',
+       ],
+       'direct_dependent_settings': {
+-        'include_dirs': [
+-          'src/libusb',
++        'cflags': [
++          '<!@(pkg-config --cflags libusb-1.0)',
+         ],
+-      },
+-      'conditions': [
+-        ['OS=="linux" or OS=="mac"', {
+-          'sources': [
+-            'src/libusb/os/poll_posix.c',
+-            'src/libusb/os/poll_posix.h',
+-            'src/libusb/os/threads_posix.c',
+-            'src/libusb/os/threads_posix.h',
+-          ],
+-          'defines': [
+-            'DEFAULT_VISIBILITY=',
+-            'HAVE_GETTIMEOFDAY=1',
+-            'HAVE_POLL_H=1',
+-            'HAVE_SYS_TIME_H=1',
+-            'LIBUSB_DESCRIBE="1.0.16"',
+-            'POLL_NFDS_TYPE=nfds_t',
+-            'THREADS_POSIX=1',
+-          ],
+-        }],
+-        ['OS=="linux"', {
+-          'sources': [
+-            'src/libusb/os/linux_usbfs.c',
+-            'src/libusb/os/linux_usbfs.h',
+-          ],
+-          'defines': [
+-            'OS_LINUX=1',
+-            '_GNU_SOURCE=1',
+-          ],
+-        }],
+-        ['chromeos==1', {
+-          'defines': [
+-            'USBI_TIMERFD_AVAILABLE',
+-          ]
+-        }],
+-        ['use_udev==1', {
+-          'sources': [
+-            'src/libusb/os/linux_udev.cc',
+-          ],
+-          'defines': [
+-            'HAVE_LIBUDEV=1',
+-            'USE_UDEV=1',
+-          ],
+-          'dependencies': [
+-            '../../device/udev_linux/udev.gyp:udev_linux',
+-          ],
+-          'include_dirs': [
+-            '../..',
+-          ],
+-        }],
+-        ['OS=="linux" and use_udev==0', {
+-          'sources': [
+-            'src/libusb/os/linux_netlink.c',
+-          ],
+-          'defines': [
+-            'HAVE_LINUX_NETLINK_H',
+-          ],
+-          'conditions': [
+-            ['clang==1', {
+-              'cflags': [
+-                '-Wno-pointer-sign',
+-              ]
+-            }]
+-          ],
+-        }],
+-        ['OS=="mac"', {
+-          'sources': [
+-            'src/libusb/os/darwin_usb.c',
+-            'src/libusb/os/darwin_usb.h',
+-          ],
+-          'defines': [
+-            'OS_DARWIN=1',
+-          ],
+-        }],
+-        ['OS=="win"', {
+-          'sources': [
+-            'src/libusb/os/poll_windows.c',
+-            'src/libusb/os/poll_windows.h',
+-            'src/libusb/os/threads_windows.c',
+-            'src/libusb/os/threads_windows.h',
+-            'src/libusb/os/windows_common.h',
+-            'src/libusb/os/windows_usb.c',
+-            'src/libusb/os/windows_usb.h',
+-            'src/msvc/config.h',
+-            'src/msvc/inttypes.h',
+-            'src/msvc/stdint.h',
+-          ],
+-          'include_dirs!': [
+-            'src',
++        'link_settings': {
++          'ldflags': [
++            '<!@(pkg-config --libs-only-L --libs-only-other libusb-1.0)',
+           ],
+-          'include_dirs': [
+-            'src/msvc',
++          'libraries': [
++            '<!@(pkg-config --libs-only-l libusb-1.0)',
+           ],
+-          'msvs_disabled_warnings': [ 4267 ],
+-        }],
+-      ],
++        },
++      },
+     },
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_libwebp_libwebp.gyp b/www/chromium/files/patch-third__party_libwebp_libwebp.gyp
new file mode 100644
index 000000000000..3a2ea0a98632
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libwebp_libwebp.gyp
@@ -0,0 +1,311 @@
+--- third_party/libwebp/libwebp.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/libwebp/libwebp.gyp
+@@ -1,298 +1,22 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-  'target_defaults': {
+-    'conditions': [
+-      ['os_posix==1 and (target_arch=="arm" or target_arch=="arm64")', {
+-        'cflags!': [ '-Os' ],
+-        'cflags': [ '-O2' ],
+-      }],
+-    ],
+-  },
+   'targets': [
+     {
+-      'target_name': 'libwebp_dec',
+-      'type': 'static_library',
+-      'dependencies' : [
+-        'libwebp_dsp',
+-        'libwebp_dsp_neon',
+-        'libwebp_utils',
+-      ],
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'dec/alpha.c',
+-        'dec/buffer.c',
+-        'dec/frame.c',
+-        'dec/idec.c',
+-        'dec/io.c',
+-        'dec/quant.c',
+-        'dec/tree.c',
+-        'dec/vp8.c',
+-        'dec/vp8l.c',
+-        'dec/webp.c',
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_demux',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'demux/demux.c',
+-      ],
+-      'dependencies' : [
+-        'libwebp_utils',
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_dsp',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'dsp/alpha_processing.c',
+-        'dsp/alpha_processing_mips_dsp_r2.c',
+-        'dsp/argb.c',
+-        'dsp/argb_mips_dsp_r2.c',
+-        'dsp/cost.c',
+-        'dsp/cost_mips32.c',
+-        'dsp/cost_mips_dsp_r2.c',
+-        'dsp/cpu.c',
+-        'dsp/dec.c',
+-        'dsp/dec_clip_tables.c',
+-        'dsp/dec_mips32.c',
+-        'dsp/dec_mips_dsp_r2.c',
+-        'dsp/enc.c',
+-        'dsp/enc_avx2.c',
+-        'dsp/enc_mips32.c',
+-        'dsp/enc_mips_dsp_r2.c',
+-        'dsp/filters.c',
+-        'dsp/filters_mips_dsp_r2.c',
+-        'dsp/lossless.c',
+-        'dsp/lossless_enc.c',
+-        'dsp/lossless_enc_mips32.c',
+-        'dsp/lossless_enc_mips_dsp_r2.c',
+-        'dsp/lossless_mips_dsp_r2.c',
+-        'dsp/rescaler.c',
+-        'dsp/rescaler_mips32.c',
+-        'dsp/rescaler_mips_dsp_r2.c',
+-        'dsp/upsampling.c',
+-        'dsp/upsampling_mips_dsp_r2.c',
+-        'dsp/yuv.c',
+-        'dsp/yuv_mips32.c',
+-        'dsp/yuv_mips_dsp_r2.c',
+-      ],
+-      'dependencies' : [
+-        'libwebp_dsp_sse2',
+-        'libwebp_dsp_sse41',
+-        'libwebp_utils',
+-      ],
+-      'conditions': [
+-        ['OS == "android"', {
+-          'dependencies': [ '../../build/android/ndk.gyp:cpu_features' ],
+-        }],
+-        # iOS uses the same project to generate build project for both device
+-        # and simulator and do not use "target_arch" variable. Other platform
+-        # set it correctly.
+-        ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64")', {
+-          'defines': [ 'WEBP_HAVE_SSE2', 'WEBP_HAVE_SSE41' ],
+-        }],
+-        ['order_profiling != 0', {
+-          'target_conditions' : [
+-            ['_toolset=="target"', {
+-              'cflags!': [ '-finstrument-functions' ],
+-            }],
+-          ],
+-        }],
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_dsp_sse2',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'dsp/alpha_processing_sse2.c',
+-        'dsp/argb_sse2.c',
+-        'dsp/cost_sse2.c',
+-        'dsp/dec_sse2.c',
+-        'dsp/enc_sse2.c',
+-        'dsp/filters_sse2.c',
+-        'dsp/lossless_enc_sse2.c',
+-        'dsp/lossless_sse2.c',
+-        'dsp/rescaler_sse2.c',
+-        'dsp/upsampling_sse2.c',
+-        'dsp/yuv_sse2.c',
+-      ],
+-      'conditions': [
+-        # iOS uses the same project to generate build project for both device
+-        # and simulator and do not use "target_arch" variable. Other platform
+-        # set it correctly.
+-        ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', {
+-          'cflags': [ '-msse2', ],
+-          'xcode_settings': { 'OTHER_CFLAGS': [ '-msse2' ] },
+-        }],
+-        ['order_profiling != 0', {
+-          'target_conditions' : [
+-            ['_toolset=="target"', {
+-              'cflags!': [ '-finstrument-functions' ],
+-            }],
+-          ],
+-        }],
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_dsp_sse41',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'dsp/alpha_processing_sse41.c',
+-        'dsp/dec_sse41.c',
+-        'dsp/enc_sse41.c',
+-        'dsp/lossless_enc_sse41.c',
+-      ],
+-      'conditions': [
+-        ['OS=="win" and clang==1', {
+-          # cl.exe's /arch flag doesn't have a setting for SSSE3/4, and cl.exe
+-          # doesn't need it for intrinsics. clang-cl does need it, though.
+-          'msvs_settings': {
+-            'VCCLCompilerTool': { 'AdditionalOptions': [ '-msse4.1' ] },
+-          },
+-        }],
+-        # iOS uses the same project to generate build project for both device
+-        # and simulator and do not use "target_arch" variable. Other platform
+-        # set it correctly.
+-        ['OS!="ios" and (target_arch=="ia32" or target_arch=="x64") and msan==0', {
+-          'cflags': [ '-msse4.1', ],
+-          'xcode_settings': { 'OTHER_CFLAGS': [ '-msse4.1' ] },
+-        }],
+-        ['order_profiling != 0', {
+-          'target_conditions' : [
+-            ['_toolset=="target"', {
+-              'cflags!': [ '-finstrument-functions' ],
+-            }],
+-          ],
+-        }],
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_dsp_neon',
+-      'includes' : [
+-        # Disable LTO due to Neon issues.
+-        # crbug.com/408997
+-        '../../build/android/disable_gcc_lto.gypi',
+-      ],
+-      'conditions': [
+-        # iOS uses the same project to generate build project for both device
+-        # and simulator and do not use "target_arch" variable. Other platform
+-        # set it correctly.
+-        ['OS == "ios" or (target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)) or (target_arch == "arm64")', {
+-          'type': 'static_library',
+-          'include_dirs': ['.'],
+-          'sources': [
+-            'dsp/dec_neon.c',
+-            'dsp/enc_neon.c',
+-            'dsp/lossless_enc_neon.c',
+-            'dsp/lossless_neon.c',
+-            'dsp/rescaler_neon.c',
+-            'dsp/upsampling_neon.c',
+-          ],
+-          'conditions': [
+-            ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', {
+-              # behavior similar to *.c.neon in an Android.mk
+-              'cflags!': [ '-mfpu=vfpv3-d16' ],
+-              'cflags': [ '-mfpu=neon' ],
+-            }],
+-            ['target_arch == "arm64"', {
+-              # avoid an ICE with gcc-4.9: b/15574841
+-              'cflags': [ '-frename-registers' ],
+-            }],
+-          ]
+-        }, {
+-          'type': 'none',
+-        }],
+-        ['order_profiling != 0', {
+-          'target_conditions' : [
+-            ['_toolset=="target"', {
+-              'cflags!': [ '-finstrument-functions' ],
+-            }],
+-          ],
+-        }],
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_enc',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'enc/alpha.c',
+-        'enc/analysis.c',
+-        'enc/backward_references.c',
+-        'enc/config.c',
+-        'enc/cost.c',
+-        'enc/delta_palettization.c',
+-        'enc/filter.c',
+-        'enc/frame.c',
+-        'enc/histogram.c',
+-        'enc/iterator.c',
+-        'enc/near_lossless.c',
+-        'enc/picture.c',
+-        'enc/picture_csp.c',
+-        'enc/picture_psnr.c',
+-        'enc/picture_rescale.c',
+-        'enc/picture_tools.c',
+-        'enc/quant.c',
+-        'enc/syntax.c',
+-        'enc/token.c',
+-        'enc/tree.c',
+-        'enc/vp8l.c',
+-        'enc/webpenc.c',
+-      ],
+-      'dependencies' : [
+-        'libwebp_utils',
+-      ],
+-    },
+-    {
+-      'target_name': 'libwebp_utils',
+-      'type': 'static_library',
+-      'include_dirs': ['.'],
+-      'sources': [
+-        'utils/bit_reader.c',
+-        'utils/bit_writer.c',
+-        'utils/color_cache.c',
+-        'utils/filters.c',
+-        'utils/huffman.c',
+-        'utils/huffman_encode.c',
+-        'utils/quant_levels.c',
+-        'utils/quant_levels_dec.c',
+-        'utils/random.c',
+-        'utils/rescaler.c',
+-        'utils/thread.c',
+-        'utils/utils.c',
+-      ],
+-      'variables': {
+-        'clang_warning_flags': [
+-          # See https://code.google.com/p/webp/issues/detail?id=253.
+-          '-Wno-incompatible-pointer-types',
+-        ]
+-      },
+-    },
+-    {
+       'target_name': 'libwebp',
+       'type': 'none',
+-      'dependencies' : [
+-        'libwebp_dec',
+-        'libwebp_demux',
+-        'libwebp_dsp',
+-        'libwebp_dsp_neon',
+-        'libwebp_enc',
+-        'libwebp_utils',
+-      ],
+       'direct_dependent_settings': {
+-        'include_dirs': ['.'],
++        'defines': [
++          'ENABLE_WEBP',
++        ],
+       },
+-      'conditions': [
+-        ['OS!="win"', {'product_name': 'webp'}],
+-      ],
+-    },
++      'link_settings': {
++        'libraries': [
++          '-lwebp -lwebpdemux',
++        ],
++      },
++    }
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_libxml_libxml.gyp b/www/chromium/files/patch-third__party_libxml_libxml.gyp
new file mode 100644
index 000000000000..79968c84cd87
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libxml_libxml.gyp
@@ -0,0 +1,309 @@
+--- third_party/libxml/libxml.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/libxml/libxml.gyp
+@@ -1,279 +1,38 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-  'variables': {
+-    'conditions': [
+-      # Define an "os_include" variable that points at the OS-specific generated
+-      # headers.  These were generated by running the configure script offline.
+-      ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+-        'os_include': 'linux'
+-      }],
+-      ['OS=="mac"', {'os_include': 'mac'}],
+-      ['OS=="win"', {'os_include': 'win32'}],
+-    ],
+-    'use_system_libxml%': 0,
+-  },
+   'targets': [
+     {
+       'target_name': 'libxml',
+-      'conditions': [
+-        ['use_system_libxml', {
+-          'conditions': [
+-            ['os_posix == 1 and OS != "mac" and OS != "ios"', {
+-              'type': 'static_library',
+-              'sources': [
+-                'chromium/libxml_utils.h',
+-                'chromium/libxml_utils.cc',
+-              ],
+-              'cflags': [
+-                '<!@(pkg-config --cflags libxml-2.0)',
+-              ],
+-              'defines': [
+-                'USE_SYSTEM_LIBXML',
+-              ],
+-              'direct_dependent_settings': {
+-                'cflags': [
+-                  '<!@(pkg-config --cflags libxml-2.0)',
+-                ],
+-                'defines': [
+-                  'USE_SYSTEM_LIBXML',
+-                ],
+-              },
+-              'link_settings': {
+-                'ldflags': [
+-                  '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
+-                ],
+-                'libraries': [
+-                  '<!@(pkg-config --libs-only-l libxml-2.0)',
+-                ],
+-              },
+-            }],
+-            ['OS == "ios"', {
+-              'type': 'static_library',
+-              'sources': [
+-                'chromium/libxml_utils.h',
+-                'chromium/libxml_utils.cc',
+-              ],
+-              'include_dirs': [
+-                '$(SDKROOT)/usr/include/libxml2',
+-              ],
+-              'all_dependent_settings': {
+-                'defines': [
+-                  'USE_SYSTEM_LIBXML',
+-                ],
+-                'include_dirs': [
+-                  '$(SDKROOT)/usr/include/libxml2',
+-                ],
+-              },
+-              'link_settings': {
+-                'xcode_settings': {
+-                  'OTHER_LDFLAGS': [
+-                    '-lxml2',
+-                  ],
+-                },
+-              },
+-            }],
+-          ],
+-        }, {  # else: !use_system_libxml
+-          'type': 'static_library',
+-          'sources': [
+-            'chromium/libxml_utils.h',
+-            'chromium/libxml_utils.cc',
+-            'linux/config.h',
+-            'linux/include/libxml/xmlversion.h',
+-            'mac/config.h',
+-            'mac/include/libxml/xmlversion.h',
+-            'src/include/libxml/c14n.h',
+-            'src/include/libxml/catalog.h',
+-            'src/include/libxml/chvalid.h',
+-            'src/include/libxml/debugXML.h',
+-            'src/include/libxml/dict.h',
+-            'src/include/libxml/DOCBparser.h',
+-            'src/include/libxml/encoding.h',
+-            'src/include/libxml/entities.h',
+-            'src/include/libxml/globals.h',
+-            'src/include/libxml/hash.h',
+-            'src/include/libxml/HTMLparser.h',
+-            'src/include/libxml/HTMLtree.h',
+-            'src/include/libxml/list.h',
+-            'src/include/libxml/parser.h',
+-            'src/include/libxml/parserInternals.h',
+-            'src/include/libxml/pattern.h',
+-            'src/include/libxml/relaxng.h',
+-            'src/include/libxml/SAX.h',
+-            'src/include/libxml/SAX2.h',
+-            'src/include/libxml/schemasInternals.h',
+-            'src/include/libxml/schematron.h',
+-            'src/include/libxml/threads.h',
+-            'src/include/libxml/tree.h',
+-            'src/include/libxml/uri.h',
+-            'src/include/libxml/valid.h',
+-            'src/include/libxml/xinclude.h',
+-            'src/include/libxml/xlink.h',
+-            'src/include/libxml/xmlautomata.h',
+-            'src/include/libxml/xmlerror.h',
+-            'src/include/libxml/xmlexports.h',
+-            'src/include/libxml/xmlIO.h',
+-            'src/include/libxml/xmlmemory.h',
+-            'src/include/libxml/xmlmodule.h',
+-            'src/include/libxml/xmlreader.h',
+-            'src/include/libxml/xmlregexp.h',
+-            'src/include/libxml/xmlsave.h',
+-            'src/include/libxml/xmlschemas.h',
+-            'src/include/libxml/xmlschemastypes.h',
+-            'src/include/libxml/xmlstring.h',
+-            'src/include/libxml/xmlunicode.h',
+-            'src/include/libxml/xmlwriter.h',
+-            'src/include/libxml/xpath.h',
+-            'src/include/libxml/xpathInternals.h',
+-            'src/include/libxml/xpointer.h',
+-            'src/include/win32config.h',
+-            'src/include/wsockcompat.h',
+-            'src/buf.c',
+-            'src/buf.h',
+-            'src/c14n.c',
+-            'src/catalog.c',
+-            'src/chvalid.c',
+-            'src/debugXML.c',
+-            'src/dict.c',
+-            'src/DOCBparser.c',
+-            'src/elfgcchack.h',
+-            'src/enc.h',
+-            'src/encoding.c',
+-            'src/entities.c',
+-            'src/error.c',
+-            'src/globals.c',
+-            'src/hash.c',
+-            'src/HTMLparser.c',
+-            'src/HTMLtree.c',
+-            'src/legacy.c',
+-            'src/libxml.h',
+-            'src/list.c',
+-            'src/parser.c',
+-            'src/parserInternals.c',
+-            'src/pattern.c',
+-            'src/relaxng.c',
+-            'src/save.h',
+-            'src/SAX.c',
+-            'src/SAX2.c',
+-            'src/schematron.c',
+-            'src/threads.c',
+-            'src/timsort.h',
+-            'src/tree.c',
+-            #'src/trio.c',
+-            #'src/trio.h',
+-            #'src/triodef.h',
+-            #'src/trionan.c',
+-            #'src/trionan.h',
+-            #'src/triop.h',
+-            #'src/triostr.c',
+-            #'src/triostr.h',
+-            'src/uri.c',
+-            'src/valid.c',
+-            'src/xinclude.c',
+-            'src/xlink.c',
+-            'src/xmlIO.c',
+-            'src/xmlmemory.c',
+-            'src/xmlmodule.c',
+-            'src/xmlreader.c',
+-            'src/xmlregexp.c',
+-            'src/xmlsave.c',
+-            'src/xmlschemas.c',
+-            'src/xmlschemastypes.c',
+-            'src/xmlstring.c',
+-            'src/xmlunicode.c',
+-            'src/xmlwriter.c',
+-            'src/xpath.c',
+-            'src/xpointer.c',
+-            #'src/xzlib.c',
+-            'src/xzlib.h',
+-            'win32/config.h',
+-            'win32/include/libxml/xmlversion.h',
+-          ],
+-          'defines': [
+-            # Define LIBXML_STATIC as nothing to match how libxml.h
+-            # (an internal header) defines LIBXML_STATIC, otherwise
+-            # we get the macro redefined warning from GCC.  (-DFOO
+-            # defines the macro FOO as 1.)
+-            'LIBXML_STATIC=',
+-          ],
+-          'variables': {
+-            'clang_warning_flags': [
+-              # libxml passes `const unsigned char*` through `const char*`.
+-              '-Wno-pointer-sign',
+-              # pattern.c and uri.c both have an intentional
+-              # `for (...);` / `while(...);` loop. I submitted a patch to
+-              # move the `'` to its own line, but until that's landed
+-              # suppress the warning:
+-              '-Wno-empty-body',
+-              # debugXML.c compares array 'arg' to NULL.
+-              '-Wno-tautological-pointer-compare',
+-              # See http://crbug.com/138571#c8
+-              '-Wno-ignored-attributes',
+-              # libxml casts from int to long to void*.
+-              '-Wno-int-to-void-pointer-cast',
+-              # libxml passes a volatile LPCRITICAL_SECTION* to a function
+-              # expecting a void* volatile*.
+-              '-Wno-incompatible-pointer-types',
+-              # trio_is_special_quantity and trio_is_negative are only
+-              # used with certain preprocessor defines set.
+-              '-Wno-unused-function',
+-            ],
+-          },
+-          'include_dirs': [
+-            '<(os_include)',
+-            '<(os_include)/include',
+-            'src/include',
+-          ],
+-          'dependencies': [
+-            '../icu/icu.gyp:icuuc',
+-            '../zlib/zlib.gyp:zlib',
+-          ],
+-          'export_dependent_settings': [
+-            '../icu/icu.gyp:icuuc',
+-          ],
+-          'direct_dependent_settings': {
+-            'defines': [
+-              'LIBXML_STATIC',
+-            ],
+-            'include_dirs': [
+-              '<(os_include)/include',
+-              'src/include',
+-            ],
+-          },
+-          'conditions': [
+-            ['OS=="linux"', {
+-              'link_settings': {
+-                'libraries': [
+-                  # We need dl for dlopen() and friends.
+-                  '-ldl',
+-                  '-lm',
+-                ],
+-              },
+-            }],
+-            # http://www.xmlsoft.org/threads.html says that this is required
+-            # when using libxml from several threads, which can possibly happen
+-            # in chrome. On linux, this is picked up by transitivity from
+-            # pkg-config output from build/linux/system.gyp.
+-            ['OS=="mac" or OS=="android"', {'defines': ['_REENTRANT']}],
+-            ['OS=="win"', {
+-              'product_name': 'libxml2',
+-              # Disable unimportant 'unused variable' warning.
+-              # TODO(jschuh): http://crbug.com/167187 size_t -> int
+-              # TODO(brucedawson): http://crbug.com/554200 fix C4311 warnings
+-              # C4311 is a VS 2015 64-bit warning for pointer truncation
+-              'msvs_disabled_warnings': [ 4018, 4267, 4311, ],
+-            }, {  # else: OS!="win"
+-              'product_name': 'xml2',
+-            }],
+-          ],
+-        }],
+-        ['OS == "ios"', {
+-          'toolsets': ['host', 'target'],
+-        }],
++      'type': 'static_library',
++      'sources': [
++        'chromium/libxml_utils.h',
++        'chromium/libxml_utils.cc',
++      ],
++      'cflags': [
++        '<!@(pkg-config --cflags libxml-2.0)',
++      ],
++      'defines': [
++        'USE_SYSTEM_LIBXML',
+       ],
++      'direct_dependent_settings': {
++        'cflags': [
++          '<!@(pkg-config --cflags libxml-2.0)',
++        ],
++        'defines': [
++          'USE_SYSTEM_LIBXML',
++        ],
++      },
++      'link_settings': {
++        'ldflags': [
++          '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
++        ],
++        'libraries': [
++          '<!@(pkg-config --libs-only-l libxml-2.0)',
++        ],
++      },
+     },
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_libxslt_libxslt.gyp b/www/chromium/files/patch-third__party_libxslt_libxslt.gyp
new file mode 100644
index 000000000000..5f6d0674452e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libxslt_libxslt.gyp
@@ -0,0 +1,150 @@
+--- third_party/libxslt/libxslt.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/libxslt/libxslt.gyp
+@@ -1,132 +1,25 @@
+-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-  'variables': {
+-    'conditions': [
+-      ['os_posix == 1 and OS != "mac"', {
+-        'os_include': 'linux'
+-      }],
+-      ['OS=="mac"', {'os_include': 'mac'}],
+-      ['OS=="win"', {'os_include': 'win32'}],
+-    ],
+-    # We used to have a separate flag for using the system
+-    # libxslt, but it seems mixing Chrome libxml and system
+-    # libxslt causes crashes that nobody has had time to diagnose.
+-    # So just put them both behind the same flag for now.
+-    'use_system_libxml%': 0,
+-  },
+   'targets': [
+     {
+       'target_name': 'libxslt',
+-      'conditions': [
+-        ['os_posix == 1 and OS != "mac" and use_system_libxml', {
+-          'type': 'none',
+-          'direct_dependent_settings': {
+-            'cflags': [
+-              '<!@(pkg-config --cflags libxslt)',
+-            ],
+-          },
+-          'link_settings': {
+-            'ldflags': [
+-              '<!@(pkg-config --libs-only-L --libs-only-other libxslt)',
+-            ],
+-            'libraries': [
+-              '<!@(pkg-config --libs-only-l libxslt)',
+-            ],
+-          },
+-        }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml
+-          'type': 'static_library',
+-          'sources': [
+-            'libxslt/attributes.c',
+-            'libxslt/attributes.h',
+-            'libxslt/attrvt.c',
+-            'libxslt/documents.c',
+-            'libxslt/documents.h',
+-            'libxslt/extensions.c',
+-            'libxslt/extensions.h',
+-            'libxslt/extra.c',
+-            'libxslt/extra.h',
+-            'libxslt/functions.c',
+-            'libxslt/functions.h',
+-            'libxslt/imports.c',
+-            'libxslt/imports.h',
+-            'libxslt/keys.c',
+-            'libxslt/keys.h',
+-            'libxslt/libxslt.h',
+-            'libxslt/namespaces.c',
+-            'libxslt/namespaces.h',
+-            'libxslt/numbers.c',
+-            'libxslt/numbersInternals.h',
+-            'libxslt/pattern.c',
+-            'libxslt/pattern.h',
+-            'libxslt/preproc.c',
+-            'libxslt/preproc.h',
+-            'libxslt/security.c',
+-            'libxslt/security.h',
+-            'libxslt/templates.c',
+-            'libxslt/templates.h',
+-            'libxslt/transform.c',
+-            'libxslt/transform.h',
+-            'libxslt/trio.h',
+-            'libxslt/triodef.h',
+-            'libxslt/variables.c',
+-            'libxslt/variables.h',
+-            'libxslt/win32config.h',
+-            'libxslt/xslt.c',
+-            'libxslt/xslt.h',
+-            'libxslt/xsltconfig.h',
+-            'libxslt/xsltexports.h',
+-            'libxslt/xsltInternals.h',
+-            'libxslt/xsltlocale.c',
+-            'libxslt/xsltlocale.h',
+-            'libxslt/xsltutils.c',
+-            'libxslt/xsltutils.h',
+-            'libxslt/xsltwin32config.h',
+-            'linux/config.h',
+-            'mac/config.h',
+-            # TODO(port): Need a pregenerated win32/config.h?
+-          ],
+-          'defines': [
+-            'LIBXSLT_STATIC',
+-          ],
+-          'include_dirs': [
+-            '<(os_include)',
+-            '.',
+-          ],
+-          'dependencies': [
+-            '../libxml/libxml.gyp:libxml',
+-          ],
+-          'direct_dependent_settings': {
+-            'defines': [
+-              'LIBXSLT_STATIC',
+-            ],
+-            'include_dirs': [
+-              '.',
+-            ],
+-          },
+-          'msvs_disabled_warnings': [
+-            # size_t to int conversion.
+-            4267,
+-            # TODO(brucedawson): http://crbug.com/554200 4311 is a
+-            # VS 2015 64-bit warning for pointer truncation
+-            4311,
+-          ],
+-          'variables': {
+-            'clang_warning_flags': [
+-              # libxslt stores a char[3] in a `const unsigned char*`.
+-              '-Wno-pointer-sign',
+-              # xsltDefaultRegion and xsltCalibrateTimestamps are only
+-              # used with certain preprocessor defines set.
+-              '-Wno-unused-function',
+-            ],
+-          },
+-          'conditions': [
+-            ['OS!="win"', {'product_name': 'xslt'}],
+-          ],
+-        }],
+-      ],
++      'type': 'none',
++      'direct_dependent_settings': {
++        'cflags': [
++          '<!@(pkg-config --cflags libxslt)',
++        ],
++      },
++      'link_settings': {
++        'ldflags': [
++          '<!@(pkg-config --libs-only-L --libs-only-other libxslt)',
++        ],
++        'libraries': [
++          '<!@(pkg-config --libs-only-l libxslt)',
++        ],
++      },
+     },
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
new file mode 100644
index 000000000000..a724057ba654
--- /dev/null
+++ b/www/chromium/files/patch-third__party_libyuv_include_libyuv_row.h
@@ -0,0 +1,11 @@
+--- third_party/libyuv/include/libyuv/row.h.orig	2016-05-11 19:03:40 UTC
++++ third_party/libyuv/include/libyuv/row.h
+@@ -201,7 +201,7 @@ extern "C" {
+ #define HAS_COPYROW_AVX
+ #define HAS_H422TOARGBROW_AVX2
+ #define HAS_I400TOARGBROW_AVX2
+-#if !(defined(_DEBUG) && defined(__i386__))
++#if !(defined(__i386__) && defined(__GNUC__))
+ // TODO(fbarchard): fix build error on android_full_debug=1
+ // https://code.google.com/p/libyuv/issues/detail?id=517
+ #define HAS_I422ALPHATOARGBROW_AVX2
diff --git a/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h b/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h
new file mode 100644
index 000000000000..791ba11d624b
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ots_include_opentype-sanitiser.h
@@ -0,0 +1,10 @@
+--- third_party/ots/include/opentype-sanitiser.h.orig	2016-03-25 13:05:02 UTC
++++ third_party/ots/include/opentype-sanitiser.h
+@@ -22,6 +22,7 @@ typedef unsigned __int64 uint64_t;
+ #else
+ #include <arpa/inet.h>
+ #include <stdint.h>
++#include <sys/types.h>
+ #endif
+ 
+ #include <algorithm>
diff --git a/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi b/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi
new file mode 100644
index 000000000000..0cf17da4a874
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_build_standalone.gypi
@@ -0,0 +1,29 @@
+--- third_party/pdfium/build/standalone.gypi.orig	2016-05-11 19:03:45 UTC
++++ third_party/pdfium/build/standalone.gypi
+@@ -18,7 +18,7 @@
+       'variables': {
+         'variables': {
+           'conditions': [
+-            ['OS=="linux" or OS=="mac"', {
++            ['OS=="linux" or OS=="mac" or OS=="freebsd"', {
+               # This handles the Unix platforms we generally deal with.
+               # Anything else gets passed through, which probably won't work
+               # very well; such hosts should pass an explicit target_arch
+@@ -31,7 +31,7 @@
+                                        s/aarch64/arm64/;\
+                                        s/mips.*/mipsel/")',
+             }, {
+-              # OS!="linux" and OS!="mac"
++              # OS!="linux" and OS!="mac" and OS!="freebsd"
+               'host_arch%': 'ia32',
+             }],
+           ],
+@@ -264,7 +264,7 @@
+       # means we have to turn off this warning (and be careful about how
+       # object destruction happens in such cases).
+       4611,
+-
++}
+       # TODO(thestig): These warnings are level 4. They will be slowly
+       # removed as code is fixed.
+       4100, # Unreferenced formal parameter
diff --git a/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h
new file mode 100644
index 000000000000..415267aa5f4f
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_core_fxcrt_include_fx__system.h
@@ -0,0 +1,11 @@
+--- third_party/pdfium/core/fxcrt/include/fx_system.h.orig	2016-05-27 12:08:17.275494000 -0400
++++ third_party/pdfium/core/fxcrt/include/fx_system.h	2016-05-27 12:08:33.590631000 -0400
+@@ -40,7 +40,7 @@
+ #elif defined(_WIN64)
+ #define _FX_OS_ _FX_WIN64_DESKTOP_
+ #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
+-#elif defined(__linux__)
++#elif defined(__linux__) || defined(__FreeBSD__)
+ #define _FX_OS_ _FX_LINUX_DESKTOP_
+ #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
+ #elif defined(__APPLE__)
diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
new file mode 100644
index 000000000000..ee5aa2b06658
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_JS__Value.cpp
@@ -0,0 +1,28 @@
+--- third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp.orig	2016-05-27 13:33:48.718479000 -0400
++++ third_party/pdfium/fpdfsdk/javascript/JS_Value.cpp	2016-05-27 13:43:12.171286000 -0400
+@@ -590,11 +590,12 @@
+ }
+ 
+ double _getLocalTZA() {
++  struct tm *lt;
+   if (!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
+     return 0;
+   time_t t = 0;
+   time(&t);
+-  localtime(&t);
++  lt = localtime(&t);
+ #if _MSC_VER >= 1900
+   // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
+   // variable declared in time.h. That variable was deprecated and in VS 2015
+@@ -602,7 +603,11 @@
+   long timezone = 0;
+   _get_timezone(&timezone);
+ #endif
++#if defined(__FreeBSD__)
++  return (double)(-(lt->tm_gmtoff * 1000));
++#else
+   return (double)(-(timezone * 1000));
++#endif
+ }
+ 
+ int _getDaylightSavingTA(double d) {
diff --git a/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
new file mode 100644
index 000000000000..091f0be63040
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_fpdfsdk_javascript_PublicMethods.cpp
@@ -0,0 +1,106 @@
+--- third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp.orig	2016-05-27 13:05:16.571632000 -0400
++++ third_party/pdfium/fpdfsdk/javascript/PublicMethods.cpp	2016-05-27 13:32:36.441412000 -0400
+@@ -61,6 +61,103 @@
+     L"May",       L"June",     L"July",     L"August",
+     L"September", L"October",  L"November", L"December"};
+ 
++#if defined(__FreeBSD__)
++/*
++ * cvt.c - IEEE floating point formatting routines for FreeBSD
++ * from GNU libc-4.6.27
++ */
++
++/*
++ *    ap_ecvt converts to decimal
++ *      the number of digits is specified by ndigit
++ *      decpt is set to the position of the decimal point
++ *      sign is set to 0 for positive, 1 for negative
++ */
++
++#define	NDIG	80
++
++static char *
++     ap_cvt(double arg, int ndigits, int *decpt, int *sign, int eflag)
++{
++    register int r2;
++    double fi, fj;
++    register char *p, *p1;
++    static char buf[NDIG];
++
++    if (ndigits >= NDIG - 1)
++	ndigits = NDIG - 2;
++    r2 = 0;
++    *sign = 0;
++    p = &buf[0];
++    if (arg < 0) {
++	*sign = 1;
++	arg = -arg;
++    }
++    arg = modf(arg, &fi);
++    p1 = &buf[NDIG];
++    /*
++     * Do integer part
++     */
++    if (fi != 0) {
++	p1 = &buf[NDIG];
++	while (fi != 0) {
++	    fj = modf(fi / 10, &fi);
++	    *--p1 = (int) ((fj + .03) * 10) + '0';
++	    r2++;
++	}
++	while (p1 < &buf[NDIG])
++	    *p++ = *p1++;
++    }
++    else if (arg > 0) {
++	while ((fj = arg * 10) < 1) {
++	    arg = fj;
++	    r2--;
++	}
++    }
++    p1 = &buf[ndigits];
++    if (eflag == 0)
++	p1 += r2;
++    *decpt = r2;
++    if (p1 < &buf[0]) {
++	buf[0] = '\0';
++	return (buf);
++    }
++    while (p <= p1 && p < &buf[NDIG]) {
++	arg *= 10;
++	arg = modf(arg, &fj);
++	*p++ = (int) fj + '0';
++    }
++    if (p1 >= &buf[NDIG]) {
++	buf[NDIG - 1] = '\0';
++	return (buf);
++    }
++    p = p1;
++    *p1 += 5;
++    while (*p1 > '9') {
++	*p1 = '0';
++	if (p1 > buf)
++	    ++ * --p1;
++	else {
++	    *p1 = '1';
++	    (*decpt)++;
++	    if (eflag == 0) {
++		if (p > buf)
++		    *p = '0';
++		p++;
++	    }
++	}
++    }
++    *p = '\0';
++    return (buf);
++}
++
++static char *
++     fcvt(double arg, int ndigits, int *decpt, int *sign)
++{
++    return (ap_cvt(arg, ndigits, decpt, sign, 0));
++}
++#endif // defined(__FreeBSD__)
++
+ bool CJS_PublicMethods::IsNumber(const FX_WCHAR* str) {
+   CFX_WideString sTrim = StrTrim(str);
+   const FX_WCHAR* pTrim = sTrim.c_str();
diff --git a/www/chromium/files/patch-third__party_pdfium_pdfium.gyp b/www/chromium/files/patch-third__party_pdfium_pdfium.gyp
new file mode 100644
index 000000000000..2bef54d1d4fd
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_pdfium.gyp
@@ -0,0 +1,11 @@
+--- third_party/pdfium/pdfium.gyp.orig	2016-05-11 19:03:45 UTC
++++ third_party/pdfium/pdfium.gyp
+@@ -44,7 +44,7 @@
+       ['pdf_enable_xfa==1', {
+         'defines': ['PDF_ENABLE_XFA'],
+       }],
+-      ['OS=="linux"', {
++      ['OS=="linux" or OS=="freebsd"', {
+         'conditions': [
+           ['target_arch=="x64"', {
+             'defines' : [ '_FX_CPU_=_FX_X64_', ],
diff --git a/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h b/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h
new file mode 100644
index 000000000000..599cabbcfdbf
--- /dev/null
+++ b/www/chromium/files/patch-third__party_pdfium_third__party_base_logging.h
@@ -0,0 +1,11 @@
+--- third_party/pdfium/third_party/base/logging.h.orig	2016-05-25 15:02:25.000000000 -0400
++++ third_party/pdfium/third_party/base/logging.h	2016-05-27 11:35:39.166720000 -0400
+@@ -10,7 +10,7 @@
+ 
+ #ifndef _WIN32
+ #define NULL_DEREF_IF_POSSIBLE \
+-  *(reinterpret_cast<volatile char*>(NULL) + 42) = 0x42;
++  *(reinterpret_cast<volatile char*>(__null) + 42) = 0x42;
+ #else
+ #define NULL_DEREF_IF_POSSIBLE
+ #endif
diff --git a/www/chromium/files/patch-third__party_re2_re2.gyp b/www/chromium/files/patch-third__party_re2_re2.gyp
new file mode 100644
index 000000000000..2b11d34e0ebe
--- /dev/null
+++ b/www/chromium/files/patch-third__party_re2_re2.gyp
@@ -0,0 +1,112 @@
+--- third_party/re2/re2.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/re2/re2.gyp
+@@ -1,84 +1,37 @@
+-# Copyright 2014 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-  'variables': {
+-    'build_for_tool%': '',
+-  },
+   'targets': [
+     {
+       'target_name': 're2',
+-      'type': 'static_library',
+-      'include_dirs': [
+-        'src',
+-        '<(DEPTH)',
+-      ],
+-      'direct_dependent_settings': {
+-        'include_dirs': [
+-          'src',
+-          '<(DEPTH)',
++      'type': 'none',
++      'variables': {
++        'headers_root_path': '.',
++        'header_filenames': [
++          're2/filtered_re2.h',
++          're2/re2.h',
++          're2/set.h',
++          're2/stringpiece.h',
++          're2/variadic_function.h',
++        ],
++        'shim_generator_additional_args': [
++          # Chromium copy of re2 is patched to rename POSIX to POSIX_SYNTAX
++          # because of collision issues that break the build.
++          # Upstream refuses to make changes:
++          # http://code.google.com/p/re2/issues/detail?id=73 .
++          '--define', 'POSIX=POSIX_SYNTAX',
+         ],
+       },
+-      'sources': [
+-        'src/re2/bitstate.cc',
+-        'src/re2/compile.cc',
+-        'src/re2/dfa.cc',
+-        'src/re2/filtered_re2.cc',
+-        'src/re2/filtered_re2.h',
+-        'src/re2/mimics_pcre.cc',
+-        'src/re2/nfa.cc',
+-        'src/re2/onepass.cc',
+-        'src/re2/parse.cc',
+-        'src/re2/perl_groups.cc',
+-        'src/re2/prefilter.cc',
+-        'src/re2/prefilter.h',
+-        'src/re2/prefilter_tree.cc',
+-        'src/re2/prefilter_tree.h',
+-        'src/re2/prog.cc',
+-        'src/re2/prog.h',
+-        'src/re2/re2.cc',
+-        'src/re2/re2.h',
+-        'src/re2/regexp.cc',
+-        'src/re2/regexp.h',
+-        'src/re2/set.cc',
+-        'src/re2/set.h',
+-        'src/re2/simplify.cc',
+-        'src/re2/stringpiece.cc',
+-        'src/re2/stringpiece.h',
+-        'src/re2/tostring.cc',
+-        'src/re2/unicode_casefold.cc',
+-        'src/re2/unicode_casefold.h',
+-        'src/re2/unicode_groups.cc',
+-        'src/re2/unicode_groups.h',
+-        'src/re2/variadic_function.h',
+-        'src/re2/walker-inl.h',
+-        'src/util/atomicops.h',
+-        'src/util/flags.h',
+-        'src/util/hash.cc',
+-        'src/util/logging.cc',
+-        'src/util/logging.h',
+-        'src/util/mutex.h',
+-        'src/util/rune.cc',
+-        'src/util/sparse_array.h',
+-        'src/util/sparse_set.h',
+-        'src/util/stringprintf.cc',
+-        'src/util/strutil.cc',
+-        'src/util/utf.h',
+-        'src/util/util.h',
+-        'src/util/valgrind.cc',
+-        'src/util/valgrind.h',
++      'includes': [
++        '../../build/shim_headers.gypi',
+       ],
+-      'conditions': [
+-        ['build_for_tool=="drmemory"', {
+-          # Treat builds for Dr. Memory as builds for MSAN to prevent false
+-          # positives created by lazily initialized memory.
+-          # See crbug.com/568119#3 .
+-          'defines': [
+-            'MEMORY_SANITIZER'
+-          ],
+-        }],
+-      ]
+-    },
++      'link_settings': {
++        'libraries': [
++          '-lre2',
++        ],
++      },
++    }
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_sfntly_sfntly.gyp b/www/chromium/files/patch-third__party_sfntly_sfntly.gyp
new file mode 100644
index 000000000000..45671b494153
--- /dev/null
+++ b/www/chromium/files/patch-third__party_sfntly_sfntly.gyp
@@ -0,0 +1,10 @@
+--- third_party/sfntly/sfntly.gyp.orig	2016-03-25 13:05:02 UTC
++++ third_party/sfntly/sfntly.gyp
+@@ -127,6 +127,7 @@
+       ],
+       'include_dirs': [
+         'src/cpp/src',
++        '<(prefix_dir)/include',
+       ],
+       # This macro must be define to suppress the use of exception
+       'defines': [
diff --git a/www/chromium/files/patch-third__party_snappy_snappy.gyp b/www/chromium/files/patch-third__party_snappy_snappy.gyp
new file mode 100644
index 000000000000..ed9733f76e7f
--- /dev/null
+++ b/www/chromium/files/patch-third__party_snappy_snappy.gyp
@@ -0,0 +1,121 @@
+--- third_party/snappy/snappy.gyp.orig	2016-05-20 17:19:03 UTC
++++ third_party/snappy/snappy.gyp
+@@ -1,104 +1,29 @@
+-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
++# Copyright 2013 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.
+ 
+ {
+-'variables': {
+-    'conditions': [
+-      # Define an "os_include" variable that points at the OS-specific generated
+-      # headers.  These were generated by running the configure script offline.
+-      ['os_posix == 1 and OS != "mac"', {
+-        'os_include': 'linux'
+-      }],
+-      ['OS=="mac"', {'os_include': 'mac'}],
+-      ['OS=="win"', {'os_include': 'win32'}],
+-    ],
+-    'use_system_libxml%': 0,
+-  },
+   'targets': [
+     {
+       'target_name': 'snappy',
+-      'type': 'static_library',
+-      'include_dirs': [
+-        '<(os_include)',
+-        'src',
+-        '../..',
+-      ],
+-      'direct_dependent_settings': {
+-        'include_dirs': [
+-          '<(os_include)',
+-          'src',
+-        ],
+-      },
++      'type': 'none',
+       'variables': {
+-        'clang_warning_flags': [
+-           # ComputeTable is unused,
+-           # https://code.google.com/p/snappy/issues/detail?id=96
+-           '-Wno-unused-function',
+-         ],
+-        'clang_warning_flags_unset': [
+-          # snappy-stubs-internal.h unapologetically has: using namespace std
+-          # https://code.google.com/p/snappy/issues/detail?id=70
+-          '-Wheader-hygiene',
++        'headers_root_path': 'src',
++        'header_filenames': [
++          'snappy-c.h',
++          'snappy-sinksource.h',
++          'snappy-stubs-public.h',
++          'snappy.h',
+         ],
+       },
+-      'sources': [
+-        'src/snappy-internal.h',
+-        'src/snappy-sinksource.cc',
+-        'src/snappy-sinksource.h',
+-        'src/snappy-stubs-internal.cc',
+-        'src/snappy-stubs-internal.h',
+-        'src/snappy.cc',
+-        'src/snappy.h',
+-      ],
+-      'conditions': [
+-        ['OS=="linux" or OS=="mac"', {
+-          'defines': [
+-            # TODO(tfarina): Only Mac and Linux has the generated config.h for
+-            # now. Generate the config.h for Windows too and enable this there
+-            # as well.
+-            'HAVE_CONFIG_H=1',
+-          ],
+-        }],
+-        ['OS=="win"', {
+-          # Signed/unsigned comparison
+-          'msvs_disabled_warnings': [
+-            # https://code.google.com/p/snappy/issues/detail?id=71
+-            4018,
+-            # https://code.google.com/p/snappy/issues/detail?id=75
+-            4267,
+-          ],
+-        }],
+-      ],
+-    },
+-    {
+-      'target_name': 'snappy_unittest',
+-      'type': 'executable',
+-      'sources': [
+-        'src/snappy-test.cc',
+-        'src/snappy-test.h',
+-        'src/snappy_unittest.cc',
+-      ],
+-      'dependencies': [
+-        'snappy',
+-        '../../base/base.gyp:base',
+-        '../../testing/gtest.gyp:gtest',
+-        '../../third_party/zlib/zlib.gyp:zlib',
++      'includes': [
++        '../../build/shim_headers.gypi',
+       ],
+-      'variables': {
+-        'clang_warning_flags': [ '-Wno-return-type' ],
+-        'clang_warning_flags_unset': [ '-Wheader-hygiene' ],
++      'link_settings': {
++        'libraries': [
++          '-lsnappy',
++        ],
+       },
+-      'conditions': [
+-        ['OS=="linux" or OS=="mac"', {
+-          'defines': [
+-            # TODO(tfarina): Only Mac and Linux has the generated config.h for
+-            # now. Generate the config.h for Windows too and enable this there
+-            # as well.
+-            'HAVE_CONFIG_H=1',
+-          ],
+-        }],
+-      ],
+     },
+   ],
+ }
diff --git a/www/chromium/files/patch-third__party_sqlite_sqlite.gyp b/www/chromium/files/patch-third__party_sqlite_sqlite.gyp
new file mode 100644
index 000000000000..7b072469fa38
--- /dev/null
+++ b/www/chromium/files/patch-third__party_sqlite_sqlite.gyp
@@ -0,0 +1,11 @@
+--- third_party/sqlite/sqlite.gyp.orig	2016-05-11 19:02:34 UTC
++++ third_party/sqlite/sqlite.gyp
+@@ -153,6 +153,8 @@
+           },
+           'include_dirs': [
+             'amalgamation',
++            # FreeBSD ...
++            '<(prefix_dir)/include',
+           ],
+           'dependencies': [
+             '../icu/icu.gyp:icui18n',
diff --git a/www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp b/www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp
new file mode 100644
index 000000000000..480846c5dc76
--- /dev/null
+++ b/www/chromium/files/patch-third__party_usrsctp_usrsctp.gyp
@@ -0,0 +1,17 @@
+--- third_party/usrsctp/usrsctp.gyp.orig	2016-05-31 16:52:03.000000000 -0400
++++ third_party/usrsctp/usrsctp.gyp	2016-06-05 17:25:20.996841000 -0400
+@@ -111,6 +111,14 @@
+           'cflags!': [ '-Werror', '-Wall' ],
+           'cflags': [ '-w' ],
+         }],
++        ['OS=="freebsd"', {
++          'defines': [
++            'HAVE_SCONN_LEN',
++            '__Userspace_os_FreeBSD',
++          ],
++          'cflags!': [ '-Werror', '-Wall' ],
++          'cflags': [ '-U__FreeBSD__', '-w' ],
++        }],
+         ['OS=="mac" or OS=="ios"', {
+           'defines': [
+             'HAVE_SA_LEN',
diff --git a/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
new file mode 100644
index 000000000000..2b7a938416ab
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_httpcommon.cc
@@ -0,0 +1,11 @@
+--- third_party/webrtc/base/httpcommon.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/httpcommon.cc
+@@ -384,7 +384,7 @@ bool HttpDateToSeconds(const std::string
+     gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
+   }
+   // TODO: Android should support timezone, see b/2441195
+-#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD)
++#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
+   tm *tm_for_timezone = localtime(&gmt);
+   *seconds = gmt + tm_for_timezone->tm_gmtoff;
+ #else
diff --git a/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h b/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h
new file mode 100644
index 000000000000..20df882d6d9b
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_ifaddrs__converter.h
@@ -0,0 +1,11 @@
+--- third_party/webrtc/base/ifaddrs_converter.h.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/ifaddrs_converter.h
+@@ -14,6 +14,8 @@
+ #if defined(WEBRTC_ANDROID)
+ #include "webrtc/base/ifaddrs-android.h"
+ #else
++#include <sys/types.h>
++#include <sys/socket.h>
+ #include <ifaddrs.h>
+ #endif  // WEBRTC_ANDROID
+ 
diff --git a/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h b/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h
new file mode 100644
index 000000000000..bbb950c6fa08
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_ipaddress.h
@@ -0,0 +1,13 @@
+--- third_party/webrtc/base/ipaddress.h.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/ipaddress.h
+@@ -17,6 +17,10 @@
+ #include <arpa/inet.h>
+ #include <netdb.h>
+ #endif
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#include <sys/socket.h>
++#endif
+ #if defined(WEBRTC_WIN)
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
diff --git a/www/chromium/files/patch-third__party_webrtc_base_linux.cc b/www/chromium/files/patch-third__party_webrtc_base_linux.cc
new file mode 100644
index 000000000000..1849944495c1
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_linux.cc
@@ -0,0 +1,17 @@
+--- third_party/webrtc/base/linux.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/linux.cc
+@@ -8,7 +8,7 @@
+  *  be found in the AUTHORS file in the root of the source tree.
+  */
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #include "webrtc/base/linux.h"
+ 
+ #include <ctype.h>
+@@ -261,4 +261,4 @@ int ReadCpuMaxFreq() {
+ 
+ }  // namespace rtc
+ 
+-#endif  // defined(WEBRTC_LINUX)
++#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
diff --git a/www/chromium/files/patch-third__party_webrtc_base_linux.h b/www/chromium/files/patch-third__party_webrtc_base_linux.h
new file mode 100644
index 000000000000..0adf4654b32d
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_linux.h
@@ -0,0 +1,18 @@
+--- third_party/webrtc/base/linux.h.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/linux.h
+@@ -11,7 +11,7 @@
+ #ifndef WEBRTC_BASE_LINUX_H_
+ #define WEBRTC_BASE_LINUX_H_
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #include <string>
+ #include <map>
+ #include <vector>
+@@ -114,5 +114,5 @@ int ReadCpuMaxFreq();
+ 
+ }  // namespace rtc
+ 
+-#endif  // defined(WEBRTC_LINUX)
++#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #endif  // WEBRTC_BASE_LINUX_H_
diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.cc b/www/chromium/files/patch-third__party_webrtc_base_network.cc
new file mode 100644
index 000000000000..4c17ec114eed
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_network.cc
@@ -0,0 +1,29 @@
+--- third_party/webrtc/base/network.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/network.cc
+@@ -18,7 +18,7 @@
+ // linux/if.h can't be included at the same time as the posix sys/if.h, and
+ // it's transitively required by linux/route.h, so include that version on
+ // linux instead of the standard posix one.
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ #include <linux/if.h>
+ #include <linux/route.h>
+ #elif !defined(__native_client__)
+@@ -634,7 +634,7 @@ bool BasicNetworkManager::CreateNetworks
+ }
+ #endif  // WEBRTC_WIN
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ bool IsDefaultRoute(const std::string& network_name) {
+   FileStream fs;
+   if (!fs.Open("/proc/net/route", "r", NULL)) {
+@@ -677,7 +677,7 @@ bool BasicNetworkManager::IsIgnoredNetwo
+       strncmp(network.name().c_str(), "vboxnet", 7) == 0) {
+     return true;
+   }
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+   // Make sure this is a default route, if we're ignoring non-defaults.
+   if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) {
+     return true;
diff --git a/www/chromium/files/patch-third__party_webrtc_base_network.h b/www/chromium/files/patch-third__party_webrtc_base_network.h
new file mode 100644
index 000000000000..1cce0be85836
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_network.h
@@ -0,0 +1,13 @@
+--- third_party/webrtc/base/network.h.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/network.h
+@@ -23,6 +23,10 @@
+ #include "webrtc/base/scoped_ptr.h"
+ #include "webrtc/base/sigslot.h"
+ 
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#endif
++
+ #if defined(WEBRTC_POSIX)
+ struct ifaddrs;
+ #endif  // defined(WEBRTC_POSIX)
diff --git a/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
new file mode 100644
index 000000000000..0331a8ba5f2b
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_physicalsocketserver.cc
@@ -0,0 +1,33 @@
+--- third_party/webrtc/base/physicalsocketserver.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/physicalsocketserver.cc
+@@ -250,7 +250,7 @@ int PhysicalSocket::GetOption(Option opt
+   socklen_t optlen = sizeof(*value);
+   int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
+   if (ret != -1 && opt == OPT_DONTFRAGMENT) {
+-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
+     *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
+ #endif
+   }
+@@ -263,7 +263,7 @@ int PhysicalSocket::SetOption(Option opt
+   if (TranslateOption(opt, &slevel, &sopt) == -1)
+     return -1;
+   if (opt == OPT_DONTFRAGMENT) {
+-#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
+     value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
+ #endif
+   }
+@@ -538,10 +538,10 @@ int PhysicalSocket::TranslateOption(Opti
+       *slevel = IPPROTO_IP;
+       *sopt = IP_DONTFRAGMENT;
+       break;
+-#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__)
++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__)
+       LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
+       return -1;
+-#elif defined(WEBRTC_POSIX)
++#elif defined(WEBRTC_POSIX) && !defined(WEBRTC_BSD)
+       *slevel = IPPROTO_IP;
+       *sopt = IP_MTU_DISCOVER;
+       break;
diff --git a/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc
new file mode 100644
index 000000000000..4dec0072f348
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_platform__thread.cc
@@ -0,0 +1,42 @@
+--- third_party/webrtc/base/platform_thread.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/platform_thread.cc
+@@ -12,11 +12,18 @@
+ 
+ #include "webrtc/base/checks.h"
+ 
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
+ #include <sys/prctl.h>
+ #include <sys/syscall.h>
+ #endif
+ 
++#if defined(WEBRTC_BSD)
++#include <pthread.h>
++#include <pthread_np.h>
++#include <sys/syscall.h>
++#include <sys/thr.h>
++#endif
++
+ namespace rtc {
+ 
+ PlatformThreadId CurrentThreadId() {
+@@ -26,6 +33,8 @@ PlatformThreadId CurrentThreadId() {
+ #elif defined(WEBRTC_POSIX)
+ #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   ret = pthread_mach_thread_np(pthread_self());
++#elif defined(WEBRTC_BSD)
++  ret = static_cast<int>(pthread_getthreadid_np());
+ #elif defined(WEBRTC_LINUX)
+   ret =  syscall(__NR_gettid);
+ #elif defined(WEBRTC_ANDROID)
+@@ -69,7 +78,9 @@ void SetCurrentThreadName(const char* na
+                      reinterpret_cast<ULONG_PTR*>(&threadname_info));
+   } __except (EXCEPTION_EXECUTE_HANDLER) {
+   }
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
++#elif defined(WEBRTC_BSD)
++  pthread_set_name_np(pthread_self(), name);
++#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD)
+   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));
+ #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
+   pthread_setname_np(name);
diff --git a/www/chromium/files/patch-third__party_webrtc_base_stringutils.h b/www/chromium/files/patch-third__party_webrtc_base_stringutils.h
new file mode 100644
index 000000000000..a1f775be6fec
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_stringutils.h
@@ -0,0 +1,17 @@
+--- third_party/webrtc/base/stringutils.h.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/stringutils.h
+@@ -23,11 +23,11 @@
+ #endif  // WEBRTC_WIN 
+ 
+ #if defined(WEBRTC_POSIX)
+-#ifdef BSD
++#if defined(WEBRTC_BSD) || defined(BSD)
+ #include <stdlib.h>
+-#else  // BSD
++#else  // WEBRTC_BSD
+ #include <alloca.h>
+-#endif  // !BSD
++#endif  // !WEBRTC_BSD
+ #endif  // WEBRTC_POSIX
+ 
+ #include <string>
diff --git a/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc b/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc
new file mode 100644
index 000000000000..117a7956293c
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_base_systeminfo.cc
@@ -0,0 +1,40 @@
+--- third_party/webrtc/base/systeminfo.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/base/systeminfo.cc
+@@ -20,8 +20,12 @@
+ #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <CoreServices/CoreServices.h>
+-#elif defined(WEBRTC_LINUX)
++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
+ #include <unistd.h>
++#if defined(WEBRTC_BSD)
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif
+ #endif
+ #if defined(WEBRTC_MAC)
+ #include <sys/sysctl.h>
+@@ -66,7 +70,7 @@ static int DetectNumberOfCores() {
+   SYSTEM_INFO si;
+   GetSystemInfo(&si);
+   number_of_cores = static_cast<int>(si.dwNumberOfProcessors);
+-#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
++#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
+   number_of_cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
+ #elif defined(WEBRTC_MAC)
+   int name[] = {CTL_HW, HW_AVAILCPU};
+@@ -174,9 +178,13 @@ int64_t SystemInfo::GetMemorySize() {
+     LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed.";
+   }
+ 
+-#elif defined(WEBRTC_MAC)
++#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
+   size_t len = sizeof(memory);
++  #if defined(WEBRTC_MAC) 
+   int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0);
++  #else
++  int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
++  #endif
+   if (error || memory == 0)
+     memory = -1;
+ #elif defined(WEBRTC_LINUX)
diff --git a/www/chromium/files/patch-third__party_webrtc_build_common.gypi b/www/chromium/files/patch-third__party_webrtc_build_common.gypi
new file mode 100644
index 000000000000..5eebe839726b
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_build_common.gypi
@@ -0,0 +1,25 @@
+--- third_party/webrtc/build/common.gypi.orig	2016-05-25 15:02:41.000000000 -0400
++++ third_party/webrtc/build/common.gypi	2016-06-05 15:36:40.916550000 -0400
+@@ -402,6 +402,13 @@
+           'WEBRTC_LINUX',
+         ],
+       }],
++      ['os_bsd==1', {
++        'defines': [
++          'WEBRTC_BSD',
++          'WEBRTC_LINUX',
++          'WEBRTC_THREAD_RR',
++        ],
++      }],
+       ['OS=="mac"', {
+         'defines': [
+           'WEBRTC_MAC',
+@@ -485,7 +492,7 @@
+             'WEBRTC_WIN',
+           ],
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or os_bsd==1', {
+           'defines': [
+             'WEBRTC_LINUX',
+           ],
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi
new file mode 100644
index 000000000000..4d2f4b28b54b
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_modules_audio__device_audio__device.gypi
@@ -0,0 +1,20 @@
+--- third_party/webrtc/modules/audio_device/audio_device.gypi.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/modules/audio_device/audio_device.gypi
+@@ -47,7 +47,7 @@
+         'fine_audio_buffer.h',
+       ],
+       'conditions': [
+-        ['OS=="linux"', {
++        ['OS=="linux" or os_bsd==1', {
+           'include_dirs': [
+             'linux',
+           ],
+@@ -113,7 +113,7 @@
+                 ],
+               },
+             }],
+-            ['OS=="linux"', {
++            ['OS=="linux" or OS=="freebsd"', {
+               'sources': [
+                 'linux/alsasymboltable_linux.cc',
+                 'linux/alsasymboltable_linux.h',
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi
new file mode 100644
index 000000000000..db98666418e1
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_modules_desktop__capture_desktop__capture.gypi
@@ -0,0 +1,14 @@
+--- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
+@@ -114,6 +114,11 @@
+             ],
+           },
+         }],
++        ['os_bsd==1', {
++          'include_dirs': [
++            '<(prefix_dir)/include',
++          ],
++        }],
+         ['OS!="win" and OS!="mac" and use_x11==0', {
+           'sources': [
+             "mouse_cursor_monitor_null.cc",
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
new file mode 100644
index 000000000000..e3b352751cc0
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_modules_rtp__rtcp_source_forward__error__correction.cc
@@ -0,0 +1,10 @@
+--- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
+@@ -14,6 +14,7 @@
+ #include <string.h>
+ 
+ #include <algorithm>
++#include <cstdlib>
+ #include <iterator>
+ 
+ #include "webrtc/base/checks.h"
diff --git a/www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc
new file mode 100644
index 000000000000..d5eefc9ee4f0
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_modules_video__coding_receiver.cc
@@ -0,0 +1,13 @@
+--- third_party/webrtc/modules/video_coding/receiver.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/modules/video_coding/receiver.cc
+@@ -121,8 +121,8 @@ VCMEncodedFrame* VCMReceiver::FrameForDe
+   // Assume that render timing errors are due to changes in the video stream.
+   if (*next_render_time_ms < 0) {
+     timing_error = true;
+-  } else if (std::abs(*next_render_time_ms - now_ms) > max_video_delay_ms_) {
+-    int frame_delay = static_cast<int>(std::abs(*next_render_time_ms - now_ms));
++  } else if (std::labs(*next_render_time_ms - now_ms) > max_video_delay_ms_) {
++    int frame_delay = static_cast<int>(std::labs(*next_render_time_ms - now_ms));
+     LOG(LS_WARNING) << "A frame about to be decoded is out of the configured "
+                     << "delay bounds (" << frame_delay << " > "
+                     << max_video_delay_ms_
diff --git a/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc
new file mode 100644
index 000000000000..1ece795a1e4e
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_system__wrappers_source_atomic32__posix.cc
@@ -0,0 +1,14 @@
+--- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc
+@@ -12,7 +12,11 @@
+ 
+ #include <assert.h>
+ #include <inttypes.h>
++#if defined(WEBRTC_BSD)
++#include <stdlib.h>
++#else
+ #include <malloc.h>
++#endif
+ 
+ #include "webrtc/common_types.h"
+ 
diff --git a/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h b/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h
new file mode 100644
index 000000000000..37da37d82e54
--- /dev/null
+++ b/www/chromium/files/patch-third__party_webrtc_voice__engine_voice__engine__defines.h
@@ -0,0 +1,11 @@
+--- third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2016-05-11 19:04:03 UTC
++++ third_party/webrtc/voice_engine/voice_engine_defines.h
+@@ -210,7 +210,7 @@ inline int VoEChannelId(int moduleId) {
+ #include <pthread.h>
+ #include <sys/socket.h>
+ #include <sys/types.h>
+-#ifndef QNX
++#if !defined(QNX) && !defined(WEBRTC_BSD)
+ #include <linux/net.h>
+ #ifndef ANDROID
+ #include <sys/soundcard.h>
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp b/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp
deleted file mode 100644
index 99a5a84ab9d3..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__bindings__core__v8__V8ScriptRunner.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp.orig	2016-03-14 18:32:33.447489424 +0100
-+++ third_party/WebKit/Source/bindings/core/v8/V8ScriptRunner.cpp	2016-03-14 19:58:58.005131694 +0100
-@@ -43,6 +43,8 @@
- 
- #if OS(WIN)
- #include <malloc.h>
-+#elif OS(FREEBSD)
-+#include <stdlib.h>
- #else
- #include <alloca.h>
- #endif
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp b/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
deleted file mode 100644
index 75e37fd77e84..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__core__core.gyp
+++ /dev/null
@@ -1,45 +0,0 @@
---- third_party/WebKit/Source/core/core.gyp.orig	2015-05-13 18:48:59.000000000 -0400
-+++ third_party/WebKit/Source/core/core.gyp	2015-05-20 17:42:49.101788000 -0400
-@@ -505,13 +505,13 @@
-           # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
-           'cflags': ['-Wno-uninitialized'],
-         }],
--        ['OS != "linux"', {
-+        ['OS != "linux" and os_bsd != 1', {
-           'sources!': [
-             'layout/LayoutThemeLinux.cpp',
-             'layout/LayoutThemeLinux.h',
-           ],
-         }],
--        ['OS != "linux" and OS != "android"', {
-+        ['OS != "linux" and OS != "android" and os_bsd != 1', {
-           'sources!': [
-             'layout/LayoutThemeFontProviderLinux.cpp',
-           ],
-@@ -617,7 +617,7 @@
-         ],
-       },
-       'conditions': [
--        ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
-+        ['(OS=="linux" or os_bsd==1) and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
-           'link_settings': {
-             'ldflags': [
-               '<!@(pkg-config --libs-only-L ipp)',
-@@ -812,7 +812,7 @@
-               # Due to a bug in gcc 4.6 in android NDK, we get warnings about uninitialized variable.
-               'cflags': ['-Wno-uninitialized'],
-             }],
--            ['OS != "linux"', {
-+            ['OS != "linux" and os_bsd != 1', {
-               'sources!': [
-                 'layout/LayoutThemeLinux.cpp',
-                 'layout/LayoutThemeLinux.h',
-@@ -837,7 +837,7 @@
-             }],
-           ],
-         }],
--        ['OS=="linux" and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
-+        ['(OS=="linux" or os_bsd==1) and "WTF_USE_WEBAUDIO_IPP=1" in feature_defines', {
-           'link_settings': {
-             'ldflags': [
-               '<!@(pkg-config --libs-only-L ipp)',
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
deleted file mode 100644
index a808e6f817a4..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp
+++ /dev/null
@@ -1,48 +0,0 @@
---- third_party/WebKit/Source/platform/blink_platform.gyp.orig	2015-09-01 16:10:53.000000000 -0400
-+++ third_party/WebKit/Source/platform/blink_platform.gyp	2015-09-03 11:17:44.822976000 -0400
-@@ -38,6 +38,9 @@
-   'targets': [{
-     'target_name': 'blink_common',
-     'type': '<(component)',
-+    'include_dirs': [
-+      '<(prefix_dir)/include',
-+    ],
-     'variables': { 'enable_wexit_time_destructors': 1 },
-     'dependencies': [
-       '../config.gyp:config',
-@@ -251,7 +254,7 @@
-           ['include', 'graphics/cpu/x86/WebGLImageConversionSSE\\.h$'],
-         ],
-       }],
--      ['OS=="linux" or OS=="android" or OS=="win"', {
-+      ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', {
-         'sources/': [
-           # Cherry-pick files excluded by the broader regular expressions above.
-           ['include', 'fonts/opentype/OpenTypeTypes\\.h$'],
-@@ -262,7 +265,7 @@
-         ],
-       },
-       ],
--      ['OS=="linux" or OS=="android"', {
-+      ['OS=="linux" or OS=="android" or os_bsd==1', {
-         'sources/': [
-           ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'],
-         ]
-@@ -345,7 +348,7 @@
-           ['exclude', 'scroll/ScrollbarThemeMac'],
-         ],
-       }],
--      ['OS != "linux" and OS != "mac" and OS != "win"', {
-+      ['OS != "linux" and OS != "mac" and OS != "win" and os_bsd != 1', {
-         'sources/': [
-           ['exclude', 'VDMX[^/]+\\.(cpp|h)$'],
-         ],
-@@ -388,7 +391,7 @@
-           ['exclude', 'Android\\.cpp$'],
-         ],
-       }],
--      ['OS=="linux"', {
-+      ['OS=="linux" or os_bsd==1', {
-         'dependencies': [
-           '<(DEPTH)/build/linux/system.gyp:fontconfig',
-         ],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp
deleted file mode 100644
index c4e03a3c5e32..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__GCInfo.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/platform/heap/GCInfo.cpp.orig	2015-07-22 08:00:24.013307000 -0400
-+++ third_party/WebKit/Source/platform/heap/GCInfo.cpp	2015-07-22 08:00:35.112590000 -0400
-@@ -8,6 +8,8 @@
- #include "platform/heap/Handle.h"
- #include "platform/heap/Heap.h"
- 
-+#include <stdlib.h>
-+
- namespace blink {
- 
- // GCInfo indices start from 1 for heap objects, with 0 being treated
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp
deleted file mode 100644
index fd872992d5e0..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__StackFrameDepth.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp.orig	2015-04-19 21:53:42.000000000 +0200
-+++ third_party/WebKit/Source/platform/heap/StackFrameDepth.cpp	2015-04-19 21:54:12.000000000 +0200
-@@ -7,6 +7,8 @@
- 
- #include "public/platform/Platform.h"
- 
-+#include <pthread_np.h>
-+
- #if OS(WIN)
- #include <stddef.h>
- #include <windows.h>
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp b/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
deleted file mode 100644
index d4a9ceee74b7..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__web__web.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/web/web.gyp.orig	2014-10-10 09:34:38 UTC
-+++ third_party/WebKit/Source/web/web.gyp
-@@ -145,7 +145,7 @@
-                       },
-                     },
-                 }],
--                ['OS == "linux"', {
-+                ['OS == "linux" or os_bsd == 1', {
-                     'dependencies': [
-                         '<(DEPTH)/build/linux/system.gyp:fontconfig',
-                     ],
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h b/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
deleted file mode 100644
index b60be0446f1f..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__ByteSwap.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- third_party/WebKit/Source/wtf/ByteSwap.h.orig	2015-08-22 15:03:03.000000000 -0400
-+++ third_party/WebKit/Source/wtf/ByteSwap.h	2015-09-03 11:19:52.852584000 -0400
-@@ -52,9 +52,15 @@
- 
- #else
- 
-+#ifndef bswap64
- ALWAYS_INLINE uint64_t bswap64(uint64_t x) { return __builtin_bswap64(x); }
-+#endif
-+#ifndef bswap32
- ALWAYS_INLINE uint32_t bswap32(uint32_t x) { return __builtin_bswap32(x); }
-+#endif
-+#ifndef bswap16
- ALWAYS_INLINE uint16_t bswap16(uint16_t x) { return __builtin_bswap16(x); }
-+#endif
- 
- #endif
- 
diff --git a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp b/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
deleted file mode 100644
index 75f74b23371d..000000000000
--- a/www/chromium/files/patch-third_party__WebKit__Source__wtf__wtf.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/WebKit/Source/wtf/wtf.gyp.orig	2014-10-10 09:34:38 UTC
-+++ third_party/WebKit/Source/wtf/wtf.gyp
-@@ -67,7 +67,7 @@
-       'target_name': 'wtf',
-       'type': '<(component)',
-       'include_dirs': [
--        '..',
-+        '..', '<(prefix_dir)/include',
-       ],
-       'dependencies': [
-           'wtf_config',
diff --git a/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py b/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py
deleted file mode 100644
index d0740f5e12b8..000000000000
--- a/www/chromium/files/patch-third_party__ffmpeg__chromium__scripts__generate_gyp.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/ffmpeg/chromium/scripts/generate_gyp.py.orig	2015-12-06 15:33:39.820492707 +0100
-+++ third_party/ffmpeg/chromium/scripts/generate_gyp.py	2015-12-06 18:01:30.369881976 +0100
-@@ -43,6 +43,8 @@
- COPYRIGHT = """# Copyright %d 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.
-+#
-+# modified: cmt@burggraben.net
- 
- # NOTE: this file is autogenerated by ffmpeg/chromium/scripts/generate_gyp.py
- 
-@@ -372,6 +374,8 @@
- 
-       if condition.PLATFORM == '*':
-         platform_condition = None
-+      elif condition.PLATFORM == 'linux':
-+        platform_condition = '(OS == "%s" or os_bsd == 1)' % condition.PLATFORM
-       else:
-         platform_condition = 'OS == "%s"' % condition.PLATFORM
- 
diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni
deleted file mode 100644
index 9b3787e5d7d4..000000000000
--- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gni
+++ /dev/null
@@ -1,319 +0,0 @@
---- third_party/ffmpeg/ffmpeg_generated.gni.orig	2016-03-05 12:24:05.365557287 +0100
-+++ third_party/ffmpeg/ffmpeg_generated.gni	2016-03-05 12:25:02.400760177 +0100
-@@ -12,7 +12,7 @@
- ffmpeg_gas_sources = []
- ffmpeg_yasm_sources = []
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-   ffmpeg_c_sources += [
-     "libavcodec/allcodecs.c",
-     "libavcodec/autorename_libavcodec_utils.c",
-@@ -144,7 +144,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-   ffmpeg_c_sources += [
-     "libavcodec/h264pred.c",
-     "libavcodec/hpeldsp.c",
-@@ -159,13 +159,13 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavformat/rawdec.c",
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aac_ac3_parser.c",
-     "libavcodec/aac_parser.c",
-@@ -207,7 +207,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
-     "libavcodec/x86/constants.c",
-@@ -218,7 +218,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-   ffmpeg_yasm_sources += [
-     "libavcodec/x86/fft.asm",
-     "libavcodec/x86/vorbisdsp.asm",
-@@ -228,7 +228,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/cabac.c",
-     "libavcodec/h264.c",
-@@ -251,7 +251,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/fft_fixed_init_arm.c",
-     "libavcodec/arm/fft_init_arm.c",
-@@ -267,7 +267,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/flac.c",
-     "libavcodec/flac_parser.c",
-@@ -278,7 +278,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/h264pred_init_arm.c",
-     "libavcodec/arm/hpeldsp_init_arm.c",
-@@ -298,7 +298,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavutil/arm/float_dsp_init_neon.c",
-   ]
-@@ -313,7 +313,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chromium") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chromium")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
-     "libavcodec/x86/h264_intrapred_init.c",
-@@ -333,13 +333,13 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chromium") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavutil/mips/float_dsp_mips.c",
-   ]
- }
- 
--if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/aacpsdsp_init.c",
-     "libavcodec/x86/dct_init.c",
-@@ -348,7 +348,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if ((is_android && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-   ffmpeg_yasm_sources += [
-     "libavcodec/x86/aacpsdsp.asm",
-     "libavcodec/x86/dct32.asm",
-@@ -357,7 +357,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/aacpsdsp_init_arm.c",
-     "libavcodec/arm/mpegaudiodsp_init_arm.c",
-@@ -368,7 +368,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/acelp_filters.c",
-     "libavcodec/acelp_pitch_delay.c",
-@@ -423,7 +423,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/h264pred_init_mips.c",
-     "libavcodec/mips/hpeldsp_init_mips.c",
-@@ -431,7 +431,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
-+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/fft_init_aarch64.c",
-     "libavcodec/aarch64/vorbisdsp_init.c",
-@@ -446,7 +446,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/h264pred_init.c",
-     "libavcodec/aarch64/hpeldsp_init_aarch64.c",
-@@ -459,7 +459,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/flacdsp_init_arm.c",
-   ]
-@@ -468,7 +468,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/h264chroma_init_arm.c",
-     "libavcodec/arm/h264dsp_init_arm.c",
-@@ -479,7 +479,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chromium") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/hpeldsp_init_neon.c",
-     "libavcodec/arm/vp8dsp_init_neon.c",
-@@ -492,14 +492,14 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_gas_sources += [
-     "libavcodec/arm/aacpsdsp_neon.S",
-     "libavcodec/arm/sbrdsp_neon.S",
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_mac && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/h264_qpel.c",
-     "libavcodec/x86/h264chroma_init.c",
-@@ -520,7 +520,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/aacdec_mips.c",
-     "libavcodec/mips/aacpsdsp_mips.c",
-@@ -529,7 +529,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromiumOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromiumOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/flacdsp_init.c",
-   ]
-@@ -544,7 +544,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/h264chroma_init_mips.c",
-     "libavcodec/mips/h264dsp_init_mips.c",
-@@ -552,7 +552,7 @@
-   ]
- }
- 
--if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/imdct15_init.c",
-     "libavcodec/aarch64/mpegaudiodsp_init.c",
-@@ -563,7 +563,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/aarch64/h264chroma_init_aarch64.c",
-     "libavcodec/aarch64/h264dsp_init_aarch64.c",
-@@ -577,7 +577,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/blockdsp_init_arm.c",
-     "libavcodec/arm/idctdsp_init_arm.c",
-@@ -601,13 +601,13 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c",
-   ]
- }
- 
--if ((is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_gas_sources += [
-     "libavcodec/arm/h264cmc_neon.S",
-     "libavcodec/arm/h264dsp_neon.S",
-@@ -622,7 +622,7 @@
-   ]
- }
- 
--if ((is_linux && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (is_linux && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-+if (((is_linux || os_bsd == 1) && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || ((is_linux || os_bsd == 1) && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) {
-   ffmpeg_c_sources += [
-     "libavcodec/x86/blockdsp_init.c",
-     "libavcodec/x86/fdct.c",
-@@ -649,7 +649,7 @@
-   ]
- }
- 
--if (is_linux && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") {
-+if ((is_linux || os_bsd == 1) && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") {
-   ffmpeg_c_sources += [
-     "libavcodec/mips/blockdsp_init_mips.c",
-     "libavcodec/mips/h263dsp_init_mips.c",
-@@ -662,7 +662,7 @@
-   ]
- }
- 
--if (is_linux && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") {
-+if ((is_linux || os_bsd == 1) && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") {
-   ffmpeg_c_sources += [
-     "libavcodec/arm/blockdsp_init_neon.c",
-     "libavcodec/arm/idctdsp_init_neon.c",
diff --git a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi b/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
deleted file mode 100644
index 5c154a8e1d2c..000000000000
--- a/www/chromium/files/patch-third_party__ffmpeg__ffmpeg_generated.gypi
+++ /dev/null
@@ -1,395 +0,0 @@
---- third_party/ffmpeg/ffmpeg_generated.gypi.orig	2016-03-05 12:28:09.310018818 +0100
-+++ third_party/ffmpeg/ffmpeg_generated.gypi	2016-03-05 12:30:10.956741641 +0100
-@@ -8,7 +8,7 @@
- {
-   'variables': {
-     'conditions': [
--      ['OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', {
-+      ['(OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"', {
-         'c_sources': [
-           'libavcodec/arm/blockdsp_init_neon.c',
-           'libavcodec/arm/idctdsp_init_neon.c',
-@@ -19,8 +19,8 @@
-           'libavcodec/arm/mpegvideo_neon.S',
-           'libavcodec/arm/simple_idct_neon.S',
-         ],
--      }],  # OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"
--      ['OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', {
-+      }],  # (OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS"
-+      ['(OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"', {
-         'c_sources': [
-           'libavcodec/mips/blockdsp_init_mips.c',
-           'libavcodec/mips/h263dsp_init_mips.c',
-@@ -31,8 +31,8 @@
-           'libavcodec/mips/qpeldsp_init_mips.c',
-           'libavcodec/mips/xvididct_init_mips.c',
-         ],
--      }],  # OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"
--      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # (OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS"
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/x86/blockdsp_init.c',
-           'libavcodec/x86/fdct.c',
-@@ -57,26 +57,26 @@
-           'libavcodec/x86/simple_idct10.asm',
-           'libavcodec/x86/xvididct.asm',
-         ],
--      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
-       ['(OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'asm_sources': [
-           'libavutil/x86/emms.asm',
-         ],
-       }],  # (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
-         'asm_sources': [
-           'libavcodec/arm/h264cmc_neon.S',
-           'libavcodec/arm/h264dsp_neon.S',
-           'libavcodec/arm/h264idct_neon.S',
-           'libavcodec/arm/h264qpel_neon.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/neon/autorename_libavcodec_neon_mpegvideo.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/arm/blockdsp_init_arm.c',
-           'libavcodec/arm/idctdsp_init_arm.c',
-@@ -98,8 +98,8 @@
-           'libavcodec/arm/simple_idct_armv5te.S',
-           'libavcodec/arm/simple_idct_armv6.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/aarch64/h264chroma_init_aarch64.c',
-           'libavcodec/aarch64/h264dsp_init_aarch64.c',
-@@ -111,8 +111,8 @@
-           'libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S',
-           'libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
-+      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/aarch64/imdct15_init.c',
-           'libavcodec/aarch64/mpegaudiodsp_init.c',
-@@ -121,36 +121,36 @@
-           'libavcodec/aarch64/imdct15_neon.S',
-           'libavcodec/aarch64/mpegaudiodsp_neon.S',
-         ],
--      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/mips/h264chroma_init_mips.c',
-           'libavcodec/mips/h264dsp_init_mips.c',
-           'libavcodec/mips/h264qpel_init_mips.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
-       ['(OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'c_sources': [
-           'compat/msvcrt/snprintf.c',
-         ],
-       }],  # (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
--      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/x86/flacdsp_init.c',
-         ],
-         'asm_sources': [
-           'libavcodec/x86/flacdsp.asm',
-         ],
--      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
-+      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/mips/aacdec_mips.c',
-           'libavcodec/mips/aacpsdsp_mips.c',
-           'libavcodec/mips/aacsbr_mips.c',
-           'libavcodec/mips/sbrdsp_mips.c',
-         ],
--      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-+      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-         'c_sources': [
-           'libavcodec/x86/h264_qpel.c',
-           'libavcodec/x86/h264chroma_init.c',
-@@ -169,14 +169,14 @@
-           'libavcodec/x86/h264_weight_10bit.asm',
-           'libavcodec/x86/qpel.asm',
-         ],
--      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")', {
-         'asm_sources': [
-           'libavcodec/arm/aacpsdsp_neon.S',
-           'libavcodec/arm/sbrdsp_neon.S',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/arm/hpeldsp_init_neon.c',
-           'libavcodec/arm/vp8dsp_init_neon.c',
-@@ -187,8 +187,8 @@
-           'libavcodec/arm/vp3dsp_neon.S',
-           'libavcodec/arm/vp8dsp_neon.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/arm/h264chroma_init_arm.c',
-           'libavcodec/arm/h264dsp_init_arm.c',
-@@ -197,16 +197,16 @@
-         'asm_sources': [
-           'libavcodec/arm/startcode_armv6.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/arm/flacdsp_init_arm.c',
-         ],
-         'asm_sources': [
-           'libavcodec/arm/flacdsp_arm.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/aarch64/h264pred_init.c',
-           'libavcodec/aarch64/hpeldsp_init_aarch64.c',
-@@ -217,8 +217,8 @@
-           'libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S',
-           'libavcodec/aarch64/videodsp.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
-+      ['(OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/aarch64/fft_init_aarch64.c',
-           'libavcodec/aarch64/vorbisdsp_init.c',
-@@ -231,15 +231,15 @@
-           'libavcodec/aarch64/vorbisdsp_neon.S',
-           'libavutil/aarch64/float_dsp_neon.S',
-         ],
--      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/mips/h264pred_init_mips.c',
-           'libavcodec/mips/hpeldsp_init_mips.c',
-           'libavcodec/mips/vp8dsp_init_mips.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/acelp_filters.c',
-           'libavcodec/acelp_pitch_delay.c',
-@@ -292,8 +292,8 @@
-           'libavformat/avidec.c',
-           'libavformat/gsmdec.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS")
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")', {
-         'c_sources': [
-           'libavcodec/arm/aacpsdsp_init_arm.c',
-           'libavcodec/arm/mpegaudiodsp_init_arm.c',
-@@ -302,29 +302,29 @@
-         'asm_sources': [
-           'libavcodec/arm/mpegaudiodsp_fixed_armv6.S',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
--      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS")
-+      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-         'asm_sources': [
-           'libavcodec/x86/aacpsdsp.asm',
-           'libavcodec/x86/dct32.asm',
-           'libavcodec/x86/imdct36.asm',
-           'libavcodec/x86/sbrdsp.asm',
-         ],
--      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
--      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-+      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
-+      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-         'c_sources': [
-           'libavcodec/x86/aacpsdsp_init.c',
-           'libavcodec/x86/dct_init.c',
-           'libavcodec/x86/mpegaudiodsp.c',
-           'libavcodec/x86/sbrdsp_init.c',
-         ],
--      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
--      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
-+      ['(OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavutil/mips/float_dsp_mips.c',
-         ],
--      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-+      }],  # (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'c_sources': [
-           'libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c',
-           'libavcodec/x86/h264_intrapred_init.c',
-@@ -342,8 +342,8 @@
-           'libavcodec/x86/vp8dsp.asm',
-           'libavcodec/x86/vp8dsp_loopfilter.asm',
-         ],
--      }],  # (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavutil/arm/float_dsp_init_neon.c',
-         ],
-@@ -356,8 +356,8 @@
-           'libavcodec/arm/rdft_neon.S',
-           'libavutil/arm/autorename_libavutil_arm_float_dsp_neon.S',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/arm/h264pred_init_arm.c',
-           'libavcodec/arm/hpeldsp_init_arm.c',
-@@ -375,8 +375,8 @@
-           'libavcodec/arm/vp8_armv6.S',
-           'libavcodec/arm/vp8dsp_armv6.S',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/flac.c',
-           'libavcodec/flac_parser.c',
-@@ -385,8 +385,8 @@
-           'libavcodec/flacdsp.c',
-           'libavformat/autorename_libavformat_flacdec.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS")
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")', {
-         'c_sources': [
-           'libavcodec/arm/fft_fixed_init_arm.c',
-           'libavcodec/arm/fft_init_arm.c',
-@@ -400,8 +400,8 @@
-           'libavcodec/arm/mdct_vfp.S',
-           'libavutil/arm/float_dsp_vfp.S',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-         'c_sources': [
-           'libavcodec/cabac.c',
-           'libavcodec/h264.c',
-@@ -422,8 +422,8 @@
-           'libavcodec/h264qpel.c',
-           'libavcodec/startcode.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
--      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
-+      ['(OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'asm_sources': [
-           'libavcodec/x86/fft.asm',
-           'libavcodec/x86/vorbisdsp.asm',
-@@ -431,8 +431,8 @@
-           'libavutil/x86/float_dsp.asm',
-           'libavutil/x86/lls.asm',
-         ],
--      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
--      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-+      }],  # (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-+      ['(OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'c_sources': [
-           'libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c',
-           'libavcodec/x86/constants.c',
-@@ -441,13 +441,13 @@
-           'libavutil/x86/autorename_libavutil_x86_float_dsp_init.c',
-           'libavutil/x86/lls_init.c',
-         ],
--      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-+      }],  # (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-       ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'c_sources': [
-           'compat/strtod.c',
-         ],
-       }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-         'c_sources': [
-           'libavcodec/aac_ac3_parser.c',
-           'libavcodec/aac_parser.c',
-@@ -481,13 +481,13 @@
-           'libavformat/mov_chan.c',
-           'libavformat/mp3dec.c',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")', {
-         'c_sources': [
-           'libavformat/rawdec.c',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
--      ['(OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome")
-+      ['((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'c_sources': [
-           'libavcodec/h264pred.c',
-           'libavcodec/hpeldsp.c',
-@@ -500,8 +500,8 @@
-           'libavcodec/vp8_parser.c',
-           'libavcodec/vp8dsp.c',
-         ],
--      }],  # (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
--      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-+      }],  # ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-+      ['(OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")', {
-         'c_sources': [
-           'libavcodec/allcodecs.c',
-           'libavcodec/autorename_libavcodec_utils.c',
-@@ -631,7 +631,7 @@
-           'libavutil/twofish.c',
-           'libavutil/utils.c',
-         ],
--      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "linux" and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-+      }],  # (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "arm64" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mips64el" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "android" and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and arm_neon == 1 and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "arm64" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "ia32" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "mipsel" and ffmpeg_branding == "ChromiumOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chrome") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromeOS") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "Chromium") or ((OS == "linux" or os_bsd == 1) and target_arch == "x64" and ffmpeg_branding == "ChromiumOS") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "mac" and target_arch == "x64" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "ia32" and ffmpeg_branding == "Chromium") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chrome") or (OS == "win" and target_arch == "x64" and ffmpeg_branding == "Chromium")
-     ],  # conditions
-   },
- }
diff --git a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c b/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
deleted file mode 100644
index d6b63698fe02..000000000000
--- a/www/chromium/files/patch-third_party__ffmpeg__libavutil__mem.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/ffmpeg/libavutil/mem.c.orig	2014-10-10 09:16:21 UTC
-+++ third_party/ffmpeg/libavutil/mem.c
-@@ -32,7 +32,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- #include <string.h>
--#if HAVE_MALLOC_H
-+#if HAVE_MALLOC_H && !defined(__FreeBSD__)
- #include <malloc.h>
- #endif
- 
diff --git a/www/chromium/files/patch-third_party__khronos__khronos.gyp b/www/chromium/files/patch-third_party__khronos__khronos.gyp
deleted file mode 100644
index 5492deb2a985..000000000000
--- a/www/chromium/files/patch-third_party__khronos__khronos.gyp
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/khronos/khronos.gyp.orig	2014-10-10 08:54:17 UTC
-+++ third_party/khronos/khronos.gyp
-@@ -11,6 +11,7 @@
-         'include_dirs': [
-           '.',
-           '../../gpu',  # Contains GLES2/gl2chromium.h
-+          '<(prefix_dir)/include',
-         ],
-       },
-     },
diff --git a/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc b/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc
deleted file mode 100644
index fd3bccbde9d5..000000000000
--- a/www/chromium/files/patch-third_party__leveldatabase__env_chromium.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/leveldatabase/env_chromium.cc.orig	2016-03-05 15:11:05.662072033 +0100
-+++ third_party/leveldatabase/env_chromium.cc	2016-03-05 15:11:42.630069103 +0100
-@@ -21,7 +21,11 @@
- #include "base/threading/thread_restrictions.h"
- #include "base/trace_event/trace_event.h"
- #include "third_party/leveldatabase/chromium_logger.h"
-+#if defined(OS_BSD)
-+#include <re2/re2.h>
-+#else
- #include "third_party/re2/src/re2/re2.h"
-+#endif
- 
- using base::FilePath;
- using leveldb::FileLock;
diff --git a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp b/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
deleted file mode 100644
index 3267cb7b1ef3..000000000000
--- a/www/chromium/files/patch-third_party__libXNVCtrl__libXNVCtrl.gyp
+++ /dev/null
@@ -1,12 +0,0 @@
---- third_party/libXNVCtrl/libXNVCtrl.gyp.orig	2014-10-10 08:54:17 UTC
-+++ third_party/libXNVCtrl/libXNVCtrl.gyp
-@@ -13,6 +13,9 @@
-         'NVCtrlLib.h',
-         'nv_control.h',
-       ],
-+      'include_dirs': [
-+        '<(prefix_dir)/include',
-+      ],
-     },
-   ],
- }
diff --git a/www/chromium/files/patch-third_party__libexif__libexif.gyp b/www/chromium/files/patch-third_party__libexif__libexif.gyp
deleted file mode 100644
index a820bf7e79c5..000000000000
--- a/www/chromium/files/patch-third_party__libexif__libexif.gyp
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/libexif/libexif.gyp.orig	2014-10-10 08:54:17 UTC
-+++ third_party/libexif/libexif.gyp
-@@ -5,9 +5,9 @@
- {
-   'variables': {
-     'conditions': [
--      ['OS == "linux" and chromeos==0', {
-+      ['(OS == "linux" or OS == "freebsd") and chromeos==0', {
-         'use_system_libexif%': 1,
--      }, {  # OS != "linux" and chromeos==0
-+      }, {  # (OS != "linux" and OS != "freebsd") or chromeos==0
-         'use_system_libexif%': 0,
-       }],
-     ],
diff --git a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp b/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
deleted file mode 100644
index aa8161fda744..000000000000
--- a/www/chromium/files/patch-third_party__libjingle__libjingle.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/libjingle/libjingle.gyp.orig	2014-10-10 09:15:32 UTC
-+++ third_party/libjingle/libjingle.gyp
-@@ -495,7 +495,7 @@
-               ],
-             }],
-             # TODO(mallinath) - Enable SCTP for iOS.
--            ['OS!="ios"', {
-+            ['OS!="ios" and os_bsd!=1', {
-               'defines': [
-                 'HAVE_SCTP',
-               ],
diff --git a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp b/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
deleted file mode 100644
index 1902c94e9cac..000000000000
--- a/www/chromium/files/patch-third_party__libjpeg_turbo__libjpeg.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/libjpeg_turbo/libjpeg.gyp.orig	2014-10-10 09:15:45 UTC
-+++ third_party/libjpeg_turbo/libjpeg.gyp
-@@ -246,7 +246,7 @@
-             ],
-           },
-         }],
--        [ 'OS=="linux" or OS=="freebsd" or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', {
-+        [ 'OS=="linux" or os_bsd==1 or (OS=="android" and (target_arch=="ia32" or target_arch=="x64"))', {
-           'conditions': [
-             [ 'use_system_yasm==0', {
-               'dependencies': [
diff --git a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp b/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
deleted file mode 100644
index ec8140d9501a..000000000000
--- a/www/chromium/files/patch-third_party__libphonenumber__libphonenumber.gyp
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/libphonenumber/libphonenumber.gyp.orig	2014-10-10 08:54:17 UTC
-+++ third_party/libphonenumber/libphonenumber.gyp
-@@ -11,6 +11,7 @@
-       # generated protocol headers to be available with "phonenumbers" include
-       # path, e.g. #include "phonenumbers/foo.pb.h".
-       '<(SHARED_INTERMEDIATE_DIR)/protoc_out/third_party/libphonenumber',
-+      '<(prefix_dir)/include',
-     ],
-     'defines': [
-       'I18N_PHONENUMBERS_USE_ICU_REGEXP=1',
diff --git a/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h b/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h
deleted file mode 100644
index 9fdd13a4a8cb..000000000000
--- a/www/chromium/files/patch-third_party__libyuv__include__libyuv__row.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/libyuv/include/libyuv/row.h.orig	2016-01-22 20:34:30.817629081 +0100
-+++ third_party/libyuv/include/libyuv/row.h	2016-01-22 21:28:33.325381305 +0100
-@@ -197,7 +199,7 @@
- #define HAS_COPYROW_AVX
- #define HAS_H422TOARGBROW_AVX2
- #define HAS_I400TOARGBROW_AVX2
--#if !(defined(_DEBUG) && defined(__i386__))
-+#if !(defined(__i386__) && defined(__GNUC__))
- // TODO(fbarchard): fix build error on android_full_debug=1
- // https://code.google.com/p/libyuv/issues/detail?id=517
- #define HAS_I422ALPHATOARGBROW_AVX2
diff --git a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h b/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
deleted file mode 100644
index 616f6aa4a7fd..000000000000
--- a/www/chromium/files/patch-third_party__ots__include__opentype-sanitiser.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/ots/include/opentype-sanitiser.h.orig	2014-10-10 09:15:53 UTC
-+++ third_party/ots/include/opentype-sanitiser.h
-@@ -22,6 +22,7 @@
- #else
- #include <arpa/inet.h>
- #include <stdint.h>
-+#include <sys/types.h>
- #endif
- 
- #include <algorithm>  // for std::min
diff --git a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi b/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi
deleted file mode 100644
index d6e50badc1a4..000000000000
--- a/www/chromium/files/patch-third_party__pdfium__build__standalone.gypi
+++ /dev/null
@@ -1,27 +0,0 @@
---- third_party/pdfium/build/standalone.gypi.orig	2014-10-10 09:15:54 UTC
-+++ third_party/pdfium/build/standalone.gypi
-@@ -13,7 +13,7 @@
-       'variables': {
-         'variables': {
-           'conditions': [
--            ['OS=="linux" or OS=="mac"', {
-+            ['OS=="linux" or OS=="mac" or OS=="freebsd"', {
-               # This handles the Unix platforms we generally deal with.
-               # Anything else gets passed through, which probably won't work
-               # very well; such hosts should pass an explicit target_arch
-@@ -26,7 +26,7 @@
-                                        s/aarch64/arm64/;\
-                                        s/mips.*/mipsel/")',
-             }, {
--              # OS!="linux" and OS!="mac"
-+              # OS!="linux" and OS!="mac" and OS!="freebsd"
-               'host_arch%': 'ia32',
-             }],
-           ],
-@@ -259,4 +259,4 @@
-     # See comment in Chromium's common.gypi for why this is needed.
-     'SYMROOT': '<(DEPTH)/xcodebuild',
-   }
--}
-\ No newline at end of file
-+}
diff --git a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h b/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h
deleted file mode 100644
index 093876a9275f..000000000000
--- a/www/chromium/files/patch-third_party__pdfium__core__include__fxcrt__fx_system.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/pdfium/core/include/fxcrt/fx_system.h.orig	2014-10-10 09:15:54 UTC
-+++ third_party/pdfium/core/include/fxcrt/fx_system.h
-@@ -21,7 +21,7 @@
- #elif defined(_WIN32) || defined(_WIN64)
- #define _FX_OS_ _FX_WIN32_DESKTOP_
- #define _FXM_PLATFORM_ _FXM_PLATFORM_WINDOWS_
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__FreeBSD__)
- #define _FX_OS_ _FX_LINUX_DESKTOP_
- #define _FXM_PLATFORM_ _FXM_PLATFORM_LINUX_
- #elif defined(__APPLE__)
diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
deleted file mode 100644
index a9bb06d82fda..000000000000
--- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__JS_Value.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
---- ./third_party/pdfium/fpdfsdk/src/javascript/JS_Value.cpp.orig	2015-12-04 23:43:52.716604000 +0100
-+++ ./third_party/pdfium/fpdfsdk/src/javascript/JS_Value.cpp	2015-12-04 23:45:17.502470000 +0100
-@@ -586,11 +586,12 @@
- }
- 
- double _getLocalTZA() {
-+  struct tm *lt;
-   if (!FSDK_IsSandBoxPolicyEnabled(FPDF_POLICY_MACHINETIME_ACCESS))
-     return 0;
-   time_t t = 0;
-   time(&t);
--  localtime(&t);
-+  lt = localtime(&t);
- #if _MSC_VER >= 1900
-   // In gcc and in Visual Studio prior to VS 2015 'timezone' is a global
-   // variable declared in time.h. That variable was deprecated and in VS 2015
-@@ -598,7 +599,11 @@
-   long timezone = 0;
-   _get_timezone(&timezone);
- #endif
-+#ifdef __FreeBSD__
-+  return (double)(-(lt->tm_gmtoff * 1000));
-+#else
-   return (double)(-(timezone * 1000));
-+#endif
- }
- 
- int _getDaylightSavingTA(double d) {
diff --git a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp b/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
deleted file mode 100644
index 32a19787b20e..000000000000
--- a/www/chromium/files/patch-third_party__pdfium__fpdfsdk__src__javascript__PublicMethods.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp.orig	2016-01-21 16:45:51.849930462 +0100
-+++ third_party/pdfium/fpdfsdk/src/javascript/PublicMethods.cpp	2016-01-21 16:46:22.626928815 +0100
-@@ -914,7 +914,7 @@
-                                            const std::vector<CJS_Value>& params,
-                                            CJS_Value& vRet,
-                                            CFX_WideString& sError) {
--#if _FX_OS_ != _FX_ANDROID_
-+#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_
-   CJS_Context* pContext = (CJS_Context*)cc;
-   if (params.size() != 6) {
-     sError = JSGetStringFromID(pContext, IDS_STRING_JSPARAMERROR);
-@@ -1214,7 +1214,7 @@
-     const std::vector<CJS_Value>& params,
-     CJS_Value& vRet,
-     CFX_WideString& sError) {
--#if _FX_OS_ != _FX_ANDROID_
-+#if _FX_OS_ != _FX_ANDROID_ && _FX_OS_ != _FX_LINUX_DESKTOP_
-   CJS_Context* pContext = (CJS_Context*)cc;
-   ASSERT(pContext != NULL);
-   CJS_EventHandler* pEvent = pContext->GetEventHandler();
diff --git a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp b/www/chromium/files/patch-third_party__pdfium__pdfium.gyp
deleted file mode 100644
index 5477cdf23665..000000000000
--- a/www/chromium/files/patch-third_party__pdfium__pdfium.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/pdfium/pdfium.gyp.orig	2014-10-10 09:15:55 UTC
-+++ third_party/pdfium/pdfium.gyp
-@@ -13,7 +13,7 @@
-       ['pdf_use_skia==1', {
-         'defines': ['_SKIA_SUPPORT_'],
-       }],
--      ['OS=="linux"', {
-+      ['OS=="linux" or OS=="freebsd"', {
-         'conditions': [
-           ['target_arch=="x64"', {
-             'defines' : [ '_FX_CPU_=_FX_X64_', ],
diff --git a/www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h b/www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h
deleted file mode 100644
index 75c1274070f4..000000000000
--- a/www/chromium/files/patch-third_party__pdfium__third_party__base__logging.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/pdfium/third_party/base/logging.h.orig	2015-04-19 17:22:14.000000000 +0200
-+++ third_party/pdfium/third_party/base/logging.h	2015-04-19 17:22:28.000000000 +0200
-@@ -10,7 +10,7 @@
- #define CHECK(condition)                                                \
-   if (!(condition)) {                                                   \
-     abort();                                                            \
--    *(reinterpret_cast<volatile char*>(NULL) + 42) = 0x42;              \
-+    *(reinterpret_cast<volatile char*>(__null) + 42) = 0x42;              \
-   }
- 
- #define NOTREACHED() abort()
diff --git a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp b/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
deleted file mode 100644
index fd55a8cc6cfd..000000000000
--- a/www/chromium/files/patch-third_party__sfntly__sfntly.gyp
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/sfntly/sfntly.gyp.orig	2015-12-04 23:48:12.085644000 +0100
-+++ third_party/sfntly/sfntly.gyp	2015-12-04 23:48:36.966732000 +0100
-@@ -127,6 +127,7 @@
-       ],
-       'include_dirs': [
-         'src/cpp/src',
-+        '<(prefix_dir)/include',
-       ],
-       # This macro must be define to suppress the use of exception
-       'defines': [
diff --git a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
deleted file mode 100644
index af4f59421e4b..000000000000
--- a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/sqlite/sqlite.gyp.orig	2015-01-21 20:28:18 UTC
-+++ third_party/sqlite/sqlite.gyp
-@@ -90,6 +90,8 @@
- 
-           'include_dirs': [
-             'amalgamation',
-+            # FreeBSD ...
-+            '<(prefix_dir)/include',
-           ],
-           'dependencies': [
-             '../icu/icu.gyp:icui18n',
diff --git a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc b/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc
deleted file mode 100644
index 862465c2c289..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__httpcommon.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/webrtc/base/httpcommon.cc.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/base/httpcommon.cc
-@@ -382,7 +382,7 @@
-     gmt = non_gmt + kTimeZoneOffsets[zindex] * 60 * 60;
-   }
-   // TODO: Android should support timezone, see b/2441195
--#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(BSD)
-+#if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
-   tm *tm_for_timezone = localtime(&gmt);
-   *seconds = gmt + tm_for_timezone->tm_gmtoff;
- #else
diff --git a/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h b/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h
deleted file mode 100644
index 2d4ded68baa9..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__ifaddrs_converter.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/webrtc/base/ifaddrs_converter.h.orig	2016-04-02 20:56:46.173477407 +0200
-+++ third_party/webrtc/base/ifaddrs_converter.h	2016-04-02 20:57:11.910537987 +0200
-@@ -14,6 +14,8 @@
- #if defined(WEBRTC_ANDROID)
- #include "webrtc/base/ifaddrs-android.h"
- #else
-+#include <sys/types.h>
-+#include <sys/socket.h>
- #include <ifaddrs.h>
- #endif  // WEBRTC_ANDROID
- 
diff --git a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h b/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
deleted file mode 100644
index bbf9a58fdd0e..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__ipaddress.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/webrtc/base/ipaddress.h.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/base/ipaddress.h
-@@ -17,6 +17,10 @@
- #include <arpa/inet.h>
- #include <netdb.h>
- #endif
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#endif
- #if defined(WEBRTC_WIN)
- #include <winsock2.h>
- #include <ws2tcpip.h>
diff --git a/www/chromium/files/patch-third_party__webrtc__base__linux.cc b/www/chromium/files/patch-third_party__webrtc__base__linux.cc
deleted file mode 100644
index ba0d967117b4..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- third_party/webrtc/base/linux.cc.orig	2015-09-26 19:26:54.911449000 +0200
-+++ third_party/webrtc/base/linux.cc	2015-09-26 19:29:09.372270000 +0200
-@@ -8,7 +8,7 @@
-  *  be found in the AUTHORS file in the root of the source tree.
-  */
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include "webrtc/base/linux.h"
- 
- #include <ctype.h>
-@@ -288,4 +288,4 @@
- 
- }  // namespace rtc
- 
--#endif  // defined(WEBRTC_LINUX)
-+#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
diff --git a/www/chromium/files/patch-third_party__webrtc__base__linux.h b/www/chromium/files/patch-third_party__webrtc__base__linux.h
deleted file mode 100644
index 73240496042a..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__linux.h
+++ /dev/null
@@ -1,18 +0,0 @@
---- third_party/webrtc/base/linux.h.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/base/linux.h
-@@ -11,7 +11,7 @@
- #ifndef WEBRTC_BASE_LINUX_H_
- #define WEBRTC_BASE_LINUX_H_
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include <string>
- #include <map>
- #include <vector>
-@@ -119,5 +119,5 @@
- 
- }  // namespace rtc
- 
--#endif  // defined(WEBRTC_LINUX)
-+#endif  // defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #endif  // WEBRTC_BASE_LINUX_H_
diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.cc b/www/chromium/files/patch-third_party__webrtc__base__network.cc
deleted file mode 100644
index f6cd6376116f..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__network.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- third_party/webrtc/base/network.cc.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/base/network.cc
-@@ -18,7 +18,7 @@
- // linux/if.h can't be included at the same time as the posix sys/if.h, and
- // it's transitively required by linux/route.h, so include that version on
- // linux instead of the standard posix one.
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- #include <linux/if.h>
- #include <linux/route.h>
- #elif !defined(__native_client__)
-@@ -479,7 +479,7 @@
- }
- #endif  // WEBRTC_WIN
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
- bool IsDefaultRoute(const std::string& network_name) {
-   FileStream fs;
-   if (!fs.Open("/proc/net/route", "r", NULL)) {
-@@ -519,7 +519,7 @@
-       strncmp(network.name().c_str(), "vnic", 4) == 0) {
-     return true;
-   }
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
-   // Make sure this is a default route, if we're ignoring non-defaults.
-   if (ignore_non_default_routes_ && !IsDefaultRoute(network.name())) {
-     return true;
diff --git a/www/chromium/files/patch-third_party__webrtc__base__network.h b/www/chromium/files/patch-third_party__webrtc__base__network.h
deleted file mode 100644
index 722bf656b2fd..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__network.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/webrtc/base/network.h.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/base/network.h
-@@ -21,6 +21,10 @@
- #include "webrtc/base/messagehandler.h"
- #include "webrtc/base/sigslot.h"
- 
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#endif
-+
- #if defined(WEBRTC_POSIX)
- struct ifaddrs;
- #endif  // defined(WEBRTC_POSIX)
diff --git a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc b/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc
deleted file mode 100644
index e4403372af96..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__physicalsocketserver.cc
+++ /dev/null
@@ -1,33 +0,0 @@
---- third_party/webrtc/base/physicalsocketserver.cc.orig	2016-03-05 12:45:44.860677404 +0100
-+++ third_party/webrtc/base/physicalsocketserver.cc	2016-03-05 12:49:57.562656619 +0100
-@@ -241,7 +241,7 @@
-   socklen_t optlen = sizeof(*value);
-   int ret = ::getsockopt(s_, slevel, sopt, (SockOptArg)value, &optlen);
-   if (ret != -1 && opt == OPT_DONTFRAGMENT) {
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-     *value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
- #endif
-   }
-@@ -254,7 +254,7 @@
-   if (TranslateOption(opt, &slevel, &sopt) == -1)
-     return -1;
-   if (opt == OPT_DONTFRAGMENT) {
--#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID)
-+#if defined(WEBRTC_LINUX) && !defined(WEBRTC_ANDROID) && !defined(WEBRTC_BSD)
-     value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
- #endif
-   }
-@@ -514,10 +514,10 @@
-       *slevel = IPPROTO_IP;
-       *sopt = IP_DONTFRAGMENT;
-       break;
--#elif defined(WEBRTC_MAC) || defined(BSD) || defined(__native_client__)
-+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD) || defined(__native_client__)
-       LOG(LS_WARNING) << "Socket::OPT_DONTFRAGMENT not supported.";
-       return -1;
--#elif defined(WEBRTC_POSIX)
-+#elif defined(WEBRTC_POSIX) && !defined(WEBRTC_BSD)
-       *slevel = IPPROTO_IP;
-       *sopt = IP_MTU_DISCOVER;
-       break;
diff --git a/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc b/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc
deleted file mode 100644
index 5feabb42f00b..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__platform_thread.cc
+++ /dev/null
@@ -1,42 +0,0 @@
---- third_party/webrtc/base/platform_thread.cc.orig	2015-09-03 11:23:10.962030000 -0400
-+++ third_party/webrtc/base/platform_thread.cc	2015-09-03 11:36:53.569521000 -0400
-@@ -14,11 +14,18 @@
- 
- #include "webrtc/base/checks.h"
- 
--#if defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_LINUX) && !defined(__FreeBSD__)
- #include <sys/prctl.h>
- #include <sys/syscall.h>
- #endif
- 
-+#if defined(WEBRTC_BSD)
-+#include <pthread.h>
-+#include <pthread_np.h>
-+#include <sys/syscall.h>
-+#include <sys/thr.h>
-+#endif
-+
- namespace rtc {
- 
- PlatformThreadId CurrentThreadId() {
-@@ -28,6 +35,8 @@
- #elif defined(WEBRTC_POSIX)
- #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   ret = pthread_mach_thread_np(pthread_self());
-+#elif defined(WEBRTC_BSD)
-+  ret = static_cast<int>(pthread_getthreadid_np());
- #elif defined(WEBRTC_LINUX)
-   ret =  syscall(__NR_gettid);
- #elif defined(WEBRTC_ANDROID)
-@@ -72,7 +81,9 @@
-                      reinterpret_cast<ULONG_PTR*>(&threadname_info));
-   } __except (EXCEPTION_EXECUTE_HANDLER) {
-   }
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#elif defined(WEBRTC_BSD)
-+  pthread_set_name_np(pthread_self(), name);
-+#elif (defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)) && !defined(WEBRTC_BSD)
-   prctl(PR_SET_NAME, reinterpret_cast<unsigned long>(name));
- #elif defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
-   pthread_setname_np(name);
diff --git a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h b/www/chromium/files/patch-third_party__webrtc__base__stringutils.h
deleted file mode 100644
index fdea78fc41a6..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__stringutils.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- third_party/webrtc/base/stringutils.h.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/base/stringutils.h
-@@ -23,11 +23,11 @@
- #endif  // WEBRTC_WIN 
- 
- #if defined(WEBRTC_POSIX)
--#ifdef BSD
-+#if defined(WEBRTC_BSD) || defined(BSD)
- #include <stdlib.h>
--#else  // BSD
-+#else  // WEBRTC_BSD
- #include <alloca.h>
--#endif  // !BSD
-+#endif  // !WEBRTC_BSD
- #endif  // WEBRTC_POSIX
- 
- #include <string>
diff --git a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc b/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
deleted file mode 100644
index 4858955e8f4d..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__base__systeminfo.cc
+++ /dev/null
@@ -1,40 +0,0 @@
---- third_party/webrtc/base/systeminfo.cc.orig	2015-10-14 18:48:28.088649000 +0200
-+++ third_party/webrtc/base/systeminfo.cc	2015-10-14 18:57:35.819790000 +0200
-@@ -20,8 +20,12 @@
- #elif defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
- #include <ApplicationServices/ApplicationServices.h>
- #include <CoreServices/CoreServices.h>
--#elif defined(WEBRTC_LINUX)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_BSD)
- #include <unistd.h>
-+#if defined(WEBRTC_BSD)
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif
- #endif
- #if defined(WEBRTC_MAC)
- #include <sys/sysctl.h>
-@@ -66,7 +70,7 @@
-   SYSTEM_INFO si;
-   GetSystemInfo(&si);
-   number_of_cores = static_cast<int>(si.dwNumberOfProcessors);
--#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID)
-+#elif defined(WEBRTC_LINUX) || defined(WEBRTC_ANDROID) || defined(WEBRTC_BSD)
-   number_of_cores = static_cast<int>(sysconf(_SC_NPROCESSORS_ONLN));
- #elif defined(WEBRTC_MAC)
-   int name[] = {CTL_HW, HW_AVAILCPU};
-@@ -174,9 +178,13 @@
-     LOG_GLE(LS_WARNING) << "GlobalMemoryStatusEx failed.";
-   }
- 
--#elif defined(WEBRTC_MAC)
-+#elif defined(WEBRTC_MAC) || defined(WEBRTC_BSD)
-   size_t len = sizeof(memory);
-+  #if defined(WEBRTC_MAC) 
-   int error = sysctlbyname("hw.memsize", &memory, &len, NULL, 0);
-+  #else
-+  int error = sysctlbyname("hw.physmem", &memory, &len, NULL, 0);
-+  #endif
-   if (error || memory == 0)
-     memory = -1;
- #else  // WEBRTC_LINUX
diff --git a/www/chromium/files/patch-third_party__webrtc__build__common.gypi b/www/chromium/files/patch-third_party__webrtc__build__common.gypi
deleted file mode 100644
index bde85ec062f4..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__build__common.gypi
+++ /dev/null
@@ -1,16 +0,0 @@
---- third_party/webrtc/build/common.gypi.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/build/common.gypi
-@@ -328,6 +328,13 @@
-           'WEBRTC_LINUX',
-         ],
-       }],
-+      ['os_bsd==1', {
-+        'defines': [
-+          'WEBRTC_BSD',
-+          'WEBRTC_LINUX',
-+          'WEBRTC_THREAD_RR',
-+        ],
-+      }],
-       ['OS=="mac"', {
-         'defines': [
-           'WEBRTC_MAC',
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi b/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
deleted file mode 100644
index 9851349a8c32..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__modules__audio_device__audio_device.gypi
+++ /dev/null
@@ -1,20 +0,0 @@
---- third_party/webrtc/modules/audio_device/audio_device.gypi.orig	2016-03-05 14:34:43.377223299 +0100
-+++ third_party/webrtc/modules/audio_device/audio_device.gypi	2016-03-05 14:36:01.230217200 +0100
-@@ -47,7 +47,7 @@
-         'fine_audio_buffer.h',
-       ],
-       'conditions': [
--        ['OS=="linux"', {
-+        ['OS=="linux" or os_bsd==1', {
-           'include_dirs': [
-             'linux',
-           ],
-@@ -113,7 +113,7 @@
-                 ],
-               },
-             }],
--            ['OS=="linux"', {
-+            ['OS=="linux" or OS=="freebsd"', {
-               'sources': [
-                 'linux/alsasymboltable_linux.cc',
-                 'linux/alsasymboltable_linux.h',
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi b/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
deleted file mode 100644
index b74e63c4f5b9..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__modules__desktop_capture__desktop_capture.gypi
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/webrtc/modules/desktop_capture/desktop_capture.gypi.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/modules/desktop_capture/desktop_capture.gypi
-@@ -110,6 +110,11 @@
-             ],
-           },
-         }],
-+        ['os_bsd==1', {
-+          'include_dirs': [
-+            '<(prefix_dir)/include',
-+          ],
-+        }],
-         ['OS!="win" and OS!="mac" and use_x11==0', {
-           'sources': [
-             "mouse_cursor_monitor_null.cc",
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc b/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
deleted file mode 100644
index 53284e3c4fa1..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__modules__rtp_rtcp__source__forward_error_correction.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/modules/rtp_rtcp/source/forward_error_correction.cc
-@@ -15,6 +15,7 @@
- #include <string.h>
- 
- #include <algorithm>
-+#include <cstdlib>
- #include <iterator>
- 
- #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
diff --git a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__receiver.cc b/www/chromium/files/patch-third_party__webrtc__modules__video_coding__receiver.cc
deleted file mode 100644
index 21a6bca8a88a..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__modules__video_coding__receiver.cc
+++ /dev/null
@@ -1,13 +0,0 @@
---- third_party/webrtc/modules/video_coding/receiver.cc.orig	2016-03-05 14:42:08.848192373 +0100
-+++ third_party/webrtc/modules/video_coding/receiver.cc	2016-03-05 14:42:51.976189113 +0100
-@@ -121,8 +121,8 @@
-   // Assume that render timing errors are due to changes in the video stream.
-   if (*next_render_time_ms < 0) {
-     timing_error = true;
--  } else if (std::abs(*next_render_time_ms - now_ms) > max_video_delay_ms_) {
--    int frame_delay = static_cast<int>(std::abs(*next_render_time_ms - now_ms));
-+  } else if (std::labs(*next_render_time_ms - now_ms) > max_video_delay_ms_) {
-+    int frame_delay = static_cast<int>(std::labs(*next_render_time_ms - now_ms));
-     LOG(LS_WARNING) << "A frame about to be decoded is out of the configured "
-                     << "delay bounds (" << frame_delay << " > "
-                     << max_video_delay_ms_
diff --git a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc b/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
deleted file mode 100644
index ff19711b78f9..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__system_wrappers__source__atomic32_posix.cc
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/webrtc/system_wrappers/source/atomic32_posix.cc.orig	2014-10-10 09:16:13 UTC
-+++ third_party/webrtc/system_wrappers/source/atomic32_posix.cc
-@@ -12,7 +12,11 @@
- 
- #include <assert.h>
- #include <inttypes.h>
-+#if defined(WEBRTC_BSD)
-+#include <stdlib.h>
-+#else
- #include <malloc.h>
-+#endif
- 
- #include "webrtc/common_types.h"
- 
diff --git a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h b/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
deleted file mode 100644
index f329db6f5085..000000000000
--- a/www/chromium/files/patch-third_party__webrtc__voice_engine__voice_engine_defines.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/webrtc/voice_engine/voice_engine_defines.h.orig	2015-07-15 16:32:13.000000000 -0400
-+++ third_party/webrtc/voice_engine/voice_engine_defines.h	2015-07-22 18:28:32.539800000 -0400
-@@ -213,7 +213,7 @@
- #include <pthread.h>
- #include <sys/socket.h>
- #include <sys/types.h>
--#ifndef QNX
-+#if !defined(QNX) && !defined(WEBRTC_BSD)
- #include <linux/net.h>
- #ifndef ANDROID
- #include <sys/soundcard.h>
diff --git a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py b/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
deleted file mode 100644
index 37d4e1543a8d..000000000000
--- a/www/chromium/files/patch-tools__gyp__pylib__gyp__generator__make.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- tools/gyp/pylib/gyp/generator/make.py.orig	2016-01-21 16:48:10.674923813 +0100
-+++ tools/gyp/pylib/gyp/generator/make.py	2016-01-21 16:52:28.811903889 +0100
-@@ -276,7 +276,7 @@
- CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS)
- CXX.target ?= %(CXX.target)s
- CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
--LINK.target ?= %(LINK.target)s
-+LINK.target ?= %(CXX.target)s
- LDFLAGS.target ?= $(LDFLAGS)
- AR.target ?= $(AR)
- 
-@@ -285,13 +285,13 @@
- 
- # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
- # to replicate this environment fallback in make as well.
--CC.host ?= %(CC.host)s
--CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
--CXX.host ?= %(CXX.host)s
--CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
--LINK.host ?= %(LINK.host)s
--LDFLAGS.host ?=
--AR.host ?= %(AR.host)s
-+CC.host ?= $(CC)
-+CFLAGS.host ?= $(CFLAGS)
-+CXX.host ?= $(CXX)
-+CXXFLAGS.host ?= $(CXXFLAGS)
-+LINK.host ?= $(CXX)
-+LDFLAGS.host ?= $(LDFLAGS)
-+AR.host ?= $(AR)
- 
- # Define a dir function that can handle spaces.
- # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
-@@ -1816,7 +1816,7 @@
-       return modules
- 
-     # Retrieve the default value of 'SHARED_LIB_SUFFIX'
--    params = {'flavor': 'linux'}
-+    params = {'flavor': 'freebsd'}
-     default_variables = {}
-     CalculateVariables(default_variables, params)
- 
diff --git a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp b/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
deleted file mode 100644
index 3587dff0b5a1..000000000000
--- a/www/chromium/files/patch-tools__gyp__test__additional-targets__src__dir1__actions.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig	2014-10-10 09:16:07 UTC
-+++ tools/gyp/test/additional-targets/src/dir1/actions.gyp
-@@ -47,7 +47,7 @@
-     },
-   ],
-   'conditions': [
--    ['OS=="linux"', {
-+    ['OS=="linux" or OS=="freebsd"', {
-       'target_defaults': {
-         'cflags': ['-fPIC'],
-       },
diff --git a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp b/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
deleted file mode 100644
index 24d8b05b4c3c..000000000000
--- a/www/chromium/files/patch-tools__gyp__test__library__src__library.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/gyp/test/library/src/library.gyp.orig	2014-10-10 09:16:07 UTC
-+++ tools/gyp/test/library/src/library.gyp
-@@ -48,7 +48,7 @@
-     },
-   ],
-   'conditions': [
--    ['OS=="linux"', {
-+    ['OS=="linux" or OS=="freebsd"', {
-       'target_defaults': {
-         # Support 64-bit shared libs (also works fine for 32-bit).
-         'cflags': ['-fPIC'],
diff --git a/www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py b/www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py
new file mode 100644
index 000000000000..393a83b05eb1
--- /dev/null
+++ b/www/chromium/files/patch-tools_gyp_pylib_gyp_generator_make.py
@@ -0,0 +1,41 @@
+--- tools/gyp/pylib/gyp/generator/make.py.orig	2016-05-11 19:04:05 UTC
++++ tools/gyp/pylib/gyp/generator/make.py
+@@ -276,7 +276,7 @@ CC.target ?= %(CC.target)s
+ CFLAGS.target ?= $(CPPFLAGS) $(CFLAGS)
+ CXX.target ?= %(CXX.target)s
+ CXXFLAGS.target ?= $(CPPFLAGS) $(CXXFLAGS)
+-LINK.target ?= %(LINK.target)s
++LINK.target ?= %(CXX.target)s
+ LDFLAGS.target ?= $(LDFLAGS)
+ AR.target ?= $(AR)
+ 
+@@ -285,13 +285,13 @@ LINK ?= $(CXX.target)
+ 
+ # TODO(evan): move all cross-compilation logic to gyp-time so we don't need
+ # to replicate this environment fallback in make as well.
+-CC.host ?= %(CC.host)s
+-CFLAGS.host ?= $(CPPFLAGS_host) $(CFLAGS_host)
+-CXX.host ?= %(CXX.host)s
+-CXXFLAGS.host ?= $(CPPFLAGS_host) $(CXXFLAGS_host)
+-LINK.host ?= %(LINK.host)s
+-LDFLAGS.host ?=
+-AR.host ?= %(AR.host)s
++CC.host ?= $(CC)
++CFLAGS.host ?= $(CFLAGS)
++CXX.host ?= $(CXX)
++CXXFLAGS.host ?= $(CXXFLAGS)
++LINK.host ?= $(CXX)
++LDFLAGS.host ?= $(LDFLAGS)
++AR.host ?= $(AR)
+ 
+ # Define a dir function that can handle spaces.
+ # http://www.gnu.org/software/make/manual/make.html#Syntax-of-Functions
+@@ -1816,7 +1816,7 @@ $(obj).$(TOOLSET)/$(TARGET)/%%.o: $(obj)
+       return modules
+ 
+     # Retrieve the default value of 'SHARED_LIB_SUFFIX'
+-    params = {'flavor': 'linux'}
++    params = {'flavor': 'freebsd'}
+     default_variables = {}
+     CalculateVariables(default_variables, params)
+ 
diff --git a/www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp b/www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp
new file mode 100644
index 000000000000..19036271ced1
--- /dev/null
+++ b/www/chromium/files/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp
@@ -0,0 +1,11 @@
+--- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig	2016-05-11 19:04:05 UTC
++++ tools/gyp/test/additional-targets/src/dir1/actions.gyp
+@@ -47,7 +47,7 @@
+     },
+   ],
+   'conditions': [
+-    ['OS=="linux"', {
++    ['OS=="linux" or OS=="freebsd"', {
+       'target_defaults': {
+         'cflags': ['-fPIC'],
+       },
diff --git a/www/chromium/files/patch-tools_gyp_test_library_src_library.gyp b/www/chromium/files/patch-tools_gyp_test_library_src_library.gyp
new file mode 100644
index 000000000000..faaab1766a2b
--- /dev/null
+++ b/www/chromium/files/patch-tools_gyp_test_library_src_library.gyp
@@ -0,0 +1,11 @@
+--- tools/gyp/test/library/src/library.gyp.orig	2016-05-11 19:04:05 UTC
++++ tools/gyp/test/library/src/library.gyp
+@@ -48,7 +48,7 @@
+     },
+   ],
+   'conditions': [
+-    ['OS=="linux"', {
++    ['OS=="linux" or OS=="freebsd"', {
+       'target_defaults': {
+         # Support 64-bit shared libs (also works fine for 32-bit).
+         'cflags': ['-fPIC'],
diff --git a/www/chromium/files/patch-ui__accessibility__accessibility.gyp b/www/chromium/files/patch-ui__accessibility__accessibility.gyp
deleted file mode 100644
index d663543ff201..000000000000
--- a/www/chromium/files/patch-ui__accessibility__accessibility.gyp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/accessibility/accessibility.gyp.orig	2015-05-21 11:55:12.129587000 -0400
-+++ ui/accessibility/accessibility.gyp	2015-05-21 11:55:47.115032000 -0400
-@@ -63,7 +63,7 @@
-             '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2'
-           ],
-         }],
--        ['OS=="linux" and chromeos==0 and use_x11==1', {
-+        ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_x11==1', {
-           'dependencies': [
-             '../../build/linux/system.gyp:atk',
-             '../../build/linux/system.gyp:gconf',
-@@ -76,7 +76,7 @@
-             ],
-           },
-         }],
--        ['OS!="linux" or chromeos==1 or use_x11==0', {
-+        ['(OS!="linux" and os_bsd==0) or chromeos==1 or use_x11==0', {
-           'sources!': [
-             'platform/ax_platform_node_auralinux.cc',
-             'platform/ax_platform_node_auralinux.h',
diff --git a/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.h b/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.h
deleted file mode 100644
index 5ee20393a940..000000000000
--- a/www/chromium/files/patch-ui__accessibility__platform__ax_platform_node.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/accessibility/platform/ax_platform_node.h.orig	2016-03-05 14:51:09.738154122 +0100
-+++ ui/accessibility/platform/ax_platform_node.h	2016-03-05 14:52:07.721568603 +0100
-@@ -22,7 +22,7 @@
- #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
- #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
- #endif
- 
diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.cc b/www/chromium/files/patch-ui__app_list__app_list_constants.cc
deleted file mode 100644
index b86b0a18a2b2..000000000000
--- a/www/chromium/files/patch-ui__app_list__app_list_constants.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/app_list/app_list_constants.cc.orig	2014-10-10 09:15:32 UTC
-+++ ui/app_list/app_list_constants.cc
-@@ -94,7 +94,7 @@
- const ui::ResourceBundle::FontStyle kItemTextFontStyle =
-     ui::ResourceBundle::SmallBoldFont;
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- #if defined(GOOGLE_CHROME_BUILD)
- const char kAppListWMClass[] = "chrome_app_list";
- #else  // CHROMIUM_BUILD
diff --git a/www/chromium/files/patch-ui__app_list__app_list_constants.h b/www/chromium/files/patch-ui__app_list__app_list_constants.h
deleted file mode 100644
index 31eed0a0bfe2..000000000000
--- a/www/chromium/files/patch-ui__app_list__app_list_constants.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/app_list/app_list_constants.h.orig	2014-10-10 09:15:32 UTC
-+++ ui/app_list/app_list_constants.h
-@@ -66,8 +66,8 @@
- 
- APP_LIST_EXPORT extern const ui::ResourceBundle::FontStyle kItemTextFontStyle;
- 
--#if defined(OS_LINUX)
--// The WM_CLASS name for the app launcher window on Linux.
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
-+// The WM_CLASS name for the app launcher window on Linux/FreeBSD.
- APP_LIST_EXPORT extern const char kAppListWMClass[];
- #endif
- 
diff --git a/www/chromium/files/patch-ui__app_list__app_list_menu.cc b/www/chromium/files/patch-ui__app_list__app_list_menu.cc
deleted file mode 100644
index cfb33946b060..000000000000
--- a/www/chromium/files/patch-ui__app_list__app_list_menu.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/app_list/app_list_menu.cc.orig	2015-04-28 09:03:36.585517000 -0400
-+++ ui/app_list/app_list_menu.cc	2015-04-28 09:04:02.340815000 -0400
-@@ -32,7 +32,7 @@
-                                users_[i].email.empty() ? users_[i].name
-                                                        : users_[i].email,
-                                0 /* group_id */);
--#elif defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#elif defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
-       menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name);
-       int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i);
-       menu_model_.SetSublabel(menu_index, users_[i].email);
diff --git a/www/chromium/files/patch-ui__app_list__views__app_list_view.cc b/www/chromium/files/patch-ui__app_list__views__app_list_view.cc
deleted file mode 100644
index 590c76edef9d..000000000000
--- a/www/chromium/files/patch-ui__app_list__views__app_list_view.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/app_list/views/app_list_view.cc.orig	2015-04-14 18:31:23.000000000 -0400
-+++ ui/app_list/views/app_list_view.cc	2015-04-28 09:00:49.202227000 -0400
-@@ -76,7 +76,7 @@
-           ::switches::kDisableDwmComposition)) {
-     return false;
-   }
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Shadows are not supported on (non-ChromeOS) Linux.
-   return false;
- #endif
-@@ -618,7 +618,7 @@
-   // the taskbar for these versions of Windows.
-   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
-     params->force_show_in_taskbar = true;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-   // Set up a custom WM_CLASS for the app launcher window. This allows task
-   // switchers in X11 environments to distinguish it from main browser windows.
-   params->wm_class_name = kAppListWMClass;
diff --git a/www/chromium/files/patch-ui__base__ime__input_method_factory.cc b/www/chromium/files/patch-ui__base__ime__input_method_factory.cc
deleted file mode 100644
index 11c35f8bdc11..000000000000
--- a/www/chromium/files/patch-ui__base__ime__input_method_factory.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/base/ime/input_method_factory.cc.orig	2015-08-22 15:01:59.000000000 -0400
-+++ ui/base/ime/input_method_factory.cc	2015-09-03 11:38:57.103095000 -0400
-@@ -15,7 +15,7 @@
- #elif defined(OS_MACOSX)
- #include "ui/base/ime/input_method_mac.h"
- #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
--      !defined(OS_CHROMEOS)
-+      !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "ui/base/ime/input_method_auralinux.h"
- #else
- #include "ui/base/ime/input_method_minimal.h"
-@@ -57,7 +57,7 @@
- #elif defined(OS_MACOSX)
-   return make_scoped_ptr(new InputMethodMac(delegate));
- #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
--      !defined(OS_CHROMEOS)
-+      !defined(OS_CHROMEOS) || defined(OS_BSD)
-   return make_scoped_ptr(new InputMethodAuraLinux(delegate));
- #else
-   return make_scoped_ptr(new InputMethodMinimal(delegate));
diff --git a/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc b/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc
deleted file mode 100644
index 50bdad161ac7..000000000000
--- a/www/chromium/files/patch-ui__base__ime__input_method_initializer.cc
+++ /dev/null
@@ -1,28 +0,0 @@
---- ui/base/ime/input_method_initializer.cc.orig	2016-01-21 16:55:32.692891135 +0100
-+++ ui/base/ime/input_method_initializer.cc	2016-01-21 16:56:57.764073061 +0100
-@@ -6,14 +6,14 @@
- 
- #if defined(OS_CHROMEOS)
- #include "ui/base/ime/ime_bridge.h"
--#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
- #include "base/logging.h"
- #include "ui/base/ime/linux/fake_input_method_context_factory.h"
- #endif
- 
- namespace {
- 
--#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
-+#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
- const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
- #endif
- 
-@@ -36,7 +36,7 @@
- void InitializeInputMethodForTesting() {
- #if defined(OS_CHROMEOS)
-   IMEBridge::Initialize();
--#elif defined(USE_AURA) && defined(OS_LINUX)
-+#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
-   if (!g_linux_input_method_context_factory)
-     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
-   const LinuxInputMethodContextFactory* factory =
diff --git a/www/chromium/files/patch-ui__base__resource__resource_bundle.cc b/www/chromium/files/patch-ui__base__resource__resource_bundle.cc
deleted file mode 100644
index e5b469704252..000000000000
--- a/www/chromium/files/patch-ui__base__resource__resource_bundle.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/base/resource/resource_bundle.cc.orig	2015-04-14 18:18:59.000000000 -0400
-+++ ui/base/resource/resource_bundle.cc	2015-04-28 08:51:21.756989000 -0400
-@@ -611,7 +611,7 @@
- #elif defined(OS_CHROMEOS)
-   // TODO(oshima): Include 200P only if the device support 200P
-   supported_scale_factors.push_back(SCALE_FACTOR_200P);
--#elif defined(OS_LINUX) && defined(ENABLE_HIDPI)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && defined(ENABLE_HIDPI)
-   supported_scale_factors.push_back(SCALE_FACTOR_200P);
- #elif defined(OS_WIN)
-   bool default_to_100P = true;
diff --git a/www/chromium/files/patch-ui__base__ui_base.gyp b/www/chromium/files/patch-ui__base__ui_base.gyp
deleted file mode 100644
index dc1b824787f0..000000000000
--- a/www/chromium/files/patch-ui__base__ui_base.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/base/ui_base.gyp.orig	2014-10-10 08:54:18 UTC
-+++ ui/base/ui_base.gyp
-@@ -434,7 +434,7 @@
-             'x/selection_utils.h',
-           ]
-         }],
--        ['use_aura==0 or OS!="linux"', {
-+        ['use_aura==0 or (OS!="linux" and os_bsd!=1)', {
-           'sources!': [
-             'resource/resource_bundle_auralinux.cc',
-           ],
diff --git a/www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc b/www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc
deleted file mode 100644
index d0fb0e7b24d5..000000000000
--- a/www/chromium/files/patch-ui__base__user_activity__user_activity_detector.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/base/user_activity/user_activity_detector.cc.orig	2015-08-02 12:18:35.398386000 -0400
-+++ ui/base/user_activity/user_activity_detector.cc	2015-08-02 12:19:07.874736000 -0400
-@@ -52,7 +52,7 @@
- 
-   ui::PlatformEventSource* platform_event_source =
-       ui::PlatformEventSource::GetInstance();
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
-   CHECK(platform_event_source);
- #endif
-   if (platform_event_source)
-@@ -62,7 +62,7 @@
- UserActivityDetector::~UserActivityDetector() {
-   ui::PlatformEventSource* platform_event_source =
-       ui::PlatformEventSource::GetInstance();
--#if defined(OS_CHROMEOS) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
-   CHECK(platform_event_source);
- #endif
-   if (platform_event_source)
diff --git a/www/chromium/files/patch-ui__base__web_ui_util.cc b/www/chromium/files/patch-ui__base__web_ui_util.cc
deleted file mode 100644
index 1220435dcb80..000000000000
--- a/www/chromium/files/patch-ui__base__web_ui_util.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/base/webui/web_ui_util.cc.orig	2015-04-14 18:18:59.000000000 -0400
-+++ ui/base/webui/web_ui_util.cc	2015-04-28 08:49:38.687761000 -0400
-@@ -174,7 +174,7 @@
- 
- // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
- // into Ozone: crbug.com/320050
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
-   font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
-       ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
- #endif
diff --git a/www/chromium/files/patch-ui__events__event_switches.cc b/www/chromium/files/patch-ui__events__event_switches.cc
deleted file mode 100644
index 090aae006943..000000000000
--- a/www/chromium/files/patch-ui__events__event_switches.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/events/event_switches.cc.orig	2014-10-10 08:54:18 UTC
-+++ ui/events/event_switches.cc
-@@ -27,7 +27,7 @@
- const char kCompensateForUnstablePinchZoom[] =
-     "compensate-for-unstable-pinch-zoom";
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- // Tells chrome to interpret events from these devices as touch events. Only
- // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
- // devices can be retrieved from 'xinput list'.
diff --git a/www/chromium/files/patch-ui__events__event_switches.h b/www/chromium/files/patch-ui__events__event_switches.h
deleted file mode 100644
index 7e7697ed2d44..000000000000
--- a/www/chromium/files/patch-ui__events__event_switches.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/events/event_switches.h.orig	2014-10-10 08:54:18 UTC
-+++ ui/events/event_switches.h
-@@ -17,7 +17,7 @@
- EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
- EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD)
- EVENTS_BASE_EXPORT extern const char kTouchDevices[];
- #endif
- 
diff --git a/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc b/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
deleted file mode 100644
index 31dc0e40b9f7..000000000000
--- a/www/chromium/files/patch-ui__events__keycodes__dom__keycode_converter.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/events/keycodes/dom/keycode_converter.cc.orig	2015-12-05 19:58:49.948228000 +0100
-+++ ui/events/keycodes/dom/keycode_converter.cc	2015-12-05 19:59:00.416726000 +0100
-@@ -17,7 +17,7 @@
- // and DOM Level 3 |code| strings.
- #if defined(OS_WIN)
- #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code}
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, xkb, code}
- #elif defined(OS_MACOSX)
- #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, mac, code}
diff --git a/www/chromium/files/patch-ui__gfx__canvas_skia.cc b/www/chromium/files/patch-ui__gfx__canvas_skia.cc
deleted file mode 100644
index c3821994cf4f..000000000000
--- a/www/chromium/files/patch-ui__gfx__canvas_skia.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/gfx/canvas_skia.cc.orig	2015-04-14 18:31:23.000000000 -0400
-+++ ui/gfx/canvas_skia.cc	2015-04-28 08:45:50.095480000 -0400
-@@ -287,7 +287,7 @@
-     Range range = StripAcceleratorChars(flags, &adjusted_text);
-     bool elide_text = ((flags & NO_ELLIPSIS) == 0);
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     // On Linux, eliding really means fading the end of the string. But only
-     // for LTR text. RTL text is still elided (on the left) with "...".
-     if (elide_text) {
diff --git a/www/chromium/files/patch-ui__gfx__render_text.cc b/www/chromium/files/patch-ui__gfx__render_text.cc
deleted file mode 100644
index 6c972f7ee340..000000000000
--- a/www/chromium/files/patch-ui__gfx__render_text.cc
+++ /dev/null
@@ -1,46 +0,0 @@
---- ui/gfx/render_text.cc.orig	2015-04-19 20:44:44.000000000 +0200
-+++ ui/gfx/render_text.cc	2015-04-19 20:45:55.000000000 +0200
-@@ -865,32 +865,33 @@
-   const int extra_content = GetContentWidth() - display_rect_.width();
-   const int cursor_width = cursor_enabled_ ? 1 : 0;
- 
--  int min_offset = 0;
--  int max_offset = 0;
-+  // avoid collisions with vm_map.h on FreeBSD --cmt
-+  int _min_offset = 0;
-+  int _max_offset = 0;
-   if (extra_content > 0) {
-     switch (GetCurrentHorizontalAlignment()) {
-       case ALIGN_LEFT:
--        min_offset = -extra_content;
-+        _min_offset = -extra_content;
-         break;
-       case ALIGN_RIGHT:
--        max_offset = extra_content;
-+        _max_offset = extra_content;
-         break;
-       case ALIGN_CENTER:
-         // The extra space reserved for cursor at the end of the text is ignored
-         // when centering text. So, to calculate the valid range for offset, we
-         // exclude that extra space, calculate the range, and add it back to the
-         // range (if cursor is enabled).
--        min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width;
--        max_offset = (extra_content - cursor_width) / 2;
-+        _min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width;
-+        _max_offset = (extra_content - cursor_width) / 2;
-         break;
-       default:
-         break;
-     }
-   }
--  if (horizontal_offset < min_offset)
--    horizontal_offset = min_offset;
--  else if (horizontal_offset > max_offset)
--    horizontal_offset = max_offset;
-+  if (horizontal_offset < _min_offset)
-+    horizontal_offset = _min_offset;
-+  else if (horizontal_offset > _max_offset)
-+    horizontal_offset = _max_offset;
- 
-   cached_bounds_and_offset_valid_ = true;
-   display_offset_.set_x(horizontal_offset);
diff --git a/www/chromium/files/patch-ui__gl__gl.gyp b/www/chromium/files/patch-ui__gl__gl.gyp
deleted file mode 100644
index 75b22c7a7aa7..000000000000
--- a/www/chromium/files/patch-ui__gl__gl.gyp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/gl/gl.gyp.orig	2014-10-10 09:15:32 UTC
-+++ ui/gl/gl.gyp
-@@ -173,7 +173,7 @@
-         },
-       ],
-       'conditions': [
--        ['OS in ("win", "android", "linux")', {
-+        ['OS in ("win", "android", "linux", "freebsd", "openbsd")', {
-           'sources': [
-             'egl_util.cc',
-             'egl_util.h',
-@@ -194,7 +194,7 @@
-             '<(DEPTH)/third_party/khronos',
-         ],
-         }],
--        ['OS in ("android", "linux")', {
-+        ['OS in ("android", "linux", "freebsd", "openbsd")', {
-           'sources': [
-             'gl_implementation_osmesa.cc',
-             'gl_implementation_osmesa.h',
diff --git a/www/chromium/files/patch-ui__gl__gl_surface_glx.cc b/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
deleted file mode 100644
index 56f22755b419..000000000000
--- a/www/chromium/files/patch-ui__gl__gl_surface_glx.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/gl/gl_surface_glx.cc.orig	2015-10-14 19:05:53.638848000 +0200
-+++ ui/gl/gl_surface_glx.cc	2015-10-14 19:06:56.014680000 +0200
-@@ -48,7 +48,7 @@
- bool g_glx_sgi_video_sync_supported = false;
- 
- static const int kGetVSyncParametersMinSeconds =
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-     // See crbug.com/373489
-     // On Linux, querying the vsync parameters might burn CPU for up to an
-     // entire vsync, so we only query periodically to reduce CPU usage.
diff --git a/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc b/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
deleted file mode 100644
index 3bcbb62628d0..000000000000
--- a/www/chromium/files/patch-ui__gl__sync_control_vsync_provider.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- ui/gl/sync_control_vsync_provider.cc.orig	2015-10-14 19:12:40.408387000 +0200
-+++ ui/gl/sync_control_vsync_provider.cc	2015-10-14 19:13:44.335913000 +0200
-@@ -10,7 +10,7 @@
- #include "base/time/time.h"
- #include "base/trace_event/trace_event.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // These constants define a reasonable range for a calculated refresh interval.
- // Calculating refreshes out of this range will be considered a fatal error.
- const int64 kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
-@@ -37,7 +37,7 @@
- void SyncControlVSyncProvider::GetVSyncParameters(
-     const UpdateVSyncCallback& callback) {
-   TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   base::TimeTicks timebase;
- 
-   // The actual clock used for the system time returned by glXGetSyncValuesOML
-@@ -153,7 +153,7 @@
-   last_timebase_ = timebase;
-   last_media_stream_counter_ = media_stream_counter;
-   callback.Run(timebase, last_good_interval_);
--#endif  // defined(OS_LINUX)
-+#endif  // defined(OS_LINUX) || defined(OS_BSD)
- }
- 
- }  // namespace gfx
diff --git a/www/chromium/files/patch-ui__message_center__message_center_style.h b/www/chromium/files/patch-ui__message_center__message_center_style.h
deleted file mode 100644
index 1e6fa73df6c6..000000000000
--- a/www/chromium/files/patch-ui__message_center__message_center_style.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/message_center/message_center_style.h.orig	2015-04-28 08:33:38.328173000 -0400
-+++ ui/message_center/message_center_style.h	2015-04-28 08:34:12.794494000 -0400
-@@ -102,7 +102,7 @@
- const int kButtonIconTopPadding = 11;      // In DIPs.
- const int kButtonIconToTitlePadding = 16;  // In DIPs.
- 
--#if !defined(OS_LINUX) || defined(USE_AURA)
-+#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
- const SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
- const SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
- #endif
diff --git a/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc b/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc
deleted file mode 100644
index 3d9a3c3d053d..000000000000
--- a/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- ui/message_center/views/message_center_button_bar.cc.orig	2015-04-28 08:29:30.741134000 -0400
-+++ ui/message_center/views/message_center_button_bar.cc	2015-04-28 08:31:16.302480000 -0400
-@@ -94,7 +94,7 @@
-     const base::string16& title)
-     : message_center_view_(message_center_view),
-       message_center_(message_center),
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-       close_bubble_button_(NULL),
- #endif
-       title_arrow_(NULL),
-@@ -169,7 +169,7 @@
-                                    IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
-   button_container_->AddChildView(settings_button_);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   close_bubble_button_ = new views::ImageButton(this);
-   close_bubble_button_->SetImage(
-       views::Button::STATE_NORMAL,
-@@ -231,7 +231,7 @@
-                     0,
-                     0);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // The close-bubble button.
-   column->AddColumn(views::GridLayout::LEADING,
-                     views::GridLayout::LEADING,
-@@ -246,7 +246,7 @@
-     layout->AddView(title_arrow_);
-   layout->AddView(notification_label_);
-   layout->AddView(button_container_);
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   layout->AddView(close_bubble_button_);
- #endif
- }
-@@ -289,7 +289,7 @@
-     else
-       message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
-     quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   } else if (sender == close_bubble_button_) {
-     message_center_view()->tray()->HideMessageCenterBubble();
- #endif
diff --git a/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h b/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h
deleted file mode 100644
index a0e9e5f1f884..000000000000
--- a/www/chromium/files/patch-ui__message_center__views__message_center_button_bar.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/message_center/views/message_center_button_bar.h.orig	2015-04-14 18:19:00.000000000 -0400
-+++ ui/message_center/views/message_center_button_bar.h	2015-04-28 08:28:10.714142000 -0400
-@@ -68,7 +68,7 @@
-   // close-on-deactivation is off. This is a tentative solution. Once pkotwicz
-   // Fixes the problem of focus-follow-mouse, close-on-deactivation will be
-   // back and this field will be removed. See crbug.com/319516.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   views::ImageButton* close_bubble_button_;
- #endif
- 
diff --git a/www/chromium/files/patch-ui__message_center__views__message_center_view.cc b/www/chromium/files/patch-ui__message_center__views__message_center_view.cc
deleted file mode 100644
index 701d8936a960..000000000000
--- a/www/chromium/files/patch-ui__message_center__views__message_center_view.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/message_center/views/message_center_view.cc.orig	2015-04-14 18:31:23.000000000 -0400
-+++ ui/message_center/views/message_center_view.cc	2015-04-28 08:26:17.078043000 -0400
-@@ -47,7 +47,7 @@
- namespace {
- 
- const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4);
--#if defined(OS_LINUX) && defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS)
- const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0);
- #endif
- const int kAnimateClearingNextNotificationDelayMS = 40;
-@@ -86,7 +86,7 @@
-   label_->SetEnabledColor(kNoNotificationsTextColor);
-   // Set transparent background to ensure that subpixel rendering
-   // is disabled. See crbug.com/169056
--#if defined(OS_LINUX) && defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS)
-   label_->SetBackgroundColor(kTransparentColor);
- #endif
-   AddChildView(label_);
diff --git a/www/chromium/files/patch-ui__message_center__views__notification_view.cc b/www/chromium/files/patch-ui__message_center__views__notification_view.cc
deleted file mode 100644
index cfa1ee168af7..000000000000
--- a/www/chromium/files/patch-ui__message_center__views__notification_view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/message_center/views/notification_view.cc.orig	2015-04-14 18:19:00.000000000 -0400
-+++ ui/message_center/views/notification_view.cc	2015-04-28 08:22:57.679978000 -0400
-@@ -278,7 +278,7 @@
-   NotificationView* notification_view =
-       new NotificationView(controller, notification);
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Don't create shadows for notification toasts on linux wih aura.
-   if (top_level)
-     return notification_view;
diff --git a/www/chromium/files/patch-ui__resources__ui_resources.grd b/www/chromium/files/patch-ui__resources__ui_resources.grd
deleted file mode 100644
index 0969426fee69..000000000000
--- a/www/chromium/files/patch-ui__resources__ui_resources.grd
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/resources/ui_resources.grd.orig	2015-10-14 19:18:12.855975000 +0200
-+++ ui/resources/ui_resources.grd	2015-10-14 19:18:28.057725000 +0200
-@@ -15,7 +15,7 @@
-       <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
-            BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
-            SAME CONDITIONALS. -->
--      <if expr="is_linux and use_aura">
-+      <if expr="(is_linux or is_bsd) and use_aura">
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" />
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_CELL" file="common/pointers/cell_big.png" />
-         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_COL_RESIZE" file="common/pointers/sb_h_double_arrow_big.png" />
diff --git a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc b/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
deleted file mode 100644
index 9e0c68d4b82e..000000000000
--- a/www/chromium/files/patch-ui__shell_dialogs__select_file_dialog.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/shell_dialogs/select_file_dialog.cc.orig	2014-10-10 08:54:19 UTC
-+++ ui/shell_dialogs/select_file_dialog.cc
-@@ -19,7 +19,7 @@
- #include "ui/shell_dialogs/select_file_dialog_mac.h"
- #elif defined(OS_ANDROID)
- #include "ui/shell_dialogs/select_file_dialog_android.h"
--#elif defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(USE_AURA) && (defined(OS_FREEBSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)))
- #include "ui/shell_dialogs/linux_shell_dialog.h"
- #endif
- 
-@@ -75,7 +75,7 @@
-       return dialog;
-   }
- 
--#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(USE_AURA) && (defined(OS_FREEBSD) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)))
-   const ui::LinuxShellDialog* shell_dialogs = ui::LinuxShellDialog::instance();
-   if (shell_dialogs)
-     return shell_dialogs->CreateSelectFileDialog(listener, policy);
diff --git a/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.h b/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.h
deleted file mode 100644
index fb042ef1cdae..000000000000
--- a/www/chromium/files/patch-ui__views__accessibility__native_view_accessibility.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/accessibility/native_view_accessibility.h.orig	2016-03-05 14:54:44.658140267 +0100
-+++ ui/views/accessibility/native_view_accessibility.h	2016-03-05 14:56:03.634184081 +0100
-@@ -22,7 +22,7 @@
- #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
- #endif
- 
--#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS)
- #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
- #endif
- 
diff --git a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc b/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
deleted file mode 100644
index 57439c97ff21..000000000000
--- a/www/chromium/files/patch-ui__views__bubble__bubble_delegate.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/bubble/bubble_delegate.cc.orig	2015-10-14 19:28:13.258489000 +0200
-+++ ui/views/bubble/bubble_delegate.cc	2015-10-14 19:28:52.612078000 +0200
-@@ -106,7 +106,7 @@
-   // the parent frame and let DWM handle compositing.  If not, then we don't
-   // want to allow the bubble to extend the frame because it will be clipped.
-   bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
--#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
-   // Linux clips bubble windows that extend outside their parent window bounds.
-   // Mac never adjusts.
-   bubble_delegate->set_adjust_if_offscreen(false);
diff --git a/www/chromium/files/patch-ui__views__controls__button__label_button.cc b/www/chromium/files/patch-ui__views__controls__button__label_button.cc
deleted file mode 100644
index 051eaac7a6c4..000000000000
--- a/www/chromium/files/patch-ui__views__controls__button__label_button.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/views/controls/button/label_button.cc.orig	2015-10-14 19:31:24.349106000 +0200
-+++ ui/views/controls/button/label_button.cc	2015-10-14 19:35:30.925886000 +0200
-@@ -23,7 +23,7 @@
- // The default spacing between the icon and text.
- const int kSpacing = 5;
- 
--#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS))
- // Default text and shadow colors for STYLE_BUTTON.
- const SkColor kStyleButtonTextColor = SK_ColorBLACK;
- const SkColor kStyleButtonShadowColor = SK_ColorWHITE;
-@@ -401,7 +401,7 @@
-     // confusion. These details should either be pushed into ui::NativeThemeWin
-     // or should be obsoleted by rendering buttons with paint calls instead of
-     // with static assets. http://crbug.com/350498
--#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
-+#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS))
-     constant_text_color = true;
-     colors[STATE_NORMAL] = kStyleButtonTextColor;
-     label_->SetBackgroundColor(theme->GetSystemColor(
diff --git a/www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc b/www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc
deleted file mode 100644
index 423c21e4090a..000000000000
--- a/www/chromium/files/patch-ui__views__controls__scrollbar__base_scroll_bar.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/controls/scrollbar/base_scroll_bar.cc.orig	2015-04-14 18:19:00.000000000 -0400
-+++ ui/views/controls/scrollbar/base_scroll_bar.cc	2015-04-28 08:04:31.469712000 -0400
-@@ -24,7 +24,7 @@
- #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h"
- #include "ui/views/widget/widget.h"
- 
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/gfx/screen.h"
- #endif
- 
diff --git a/www/chromium/files/patch-ui__views__controls__textfield__textfield.cc b/www/chromium/files/patch-ui__views__controls__textfield__textfield.cc
deleted file mode 100644
index 9c15abf3538f..000000000000
--- a/www/chromium/files/patch-ui__views__controls__textfield__textfield.cc
+++ /dev/null
@@ -1,83 +0,0 @@
---- ui/views/controls/textfield/textfield.cc.orig	2015-04-14 18:31:23.000000000 -0400
-+++ ui/views/controls/textfield/textfield.cc	2015-04-28 07:58:48.300682000 -0400
-@@ -41,7 +41,7 @@
- #include "base/win/win_util.h"
- #endif
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "base/strings/utf_string_conversions.h"
- #include "ui/events/linux/text_edit_command_auralinux.h"
- #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
-@@ -124,7 +124,7 @@
-     case ui::VKEY_BACK:
-       if (!control || has_selection)
-         return IDS_DELETE_BACKWARD;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-       // Only erase by line break on Linux and ChromeOS.
-       if (shift)
-         return IDS_DELETE_TO_BEGINNING_OF_LINE;
-@@ -133,7 +133,7 @@
-     case ui::VKEY_DELETE:
-       if (!control || has_selection)
-         return (shift && has_selection) ? IDS_APP_CUT : IDS_DELETE_FORWARD;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-       // Only erase by line break on Linux and ChromeOS.
-       if (shift)
-         return IDS_DELETE_TO_END_OF_LINE;
-@@ -148,7 +148,7 @@
-   }
- }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- // Convert a custom text edit |command| to the equivalent views command ID.
- int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
-   const bool select = command.extend_selection();
-@@ -612,7 +612,7 @@
-       OnAfterUserAction();
-     }
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-     if (event.IsOnlyMiddleMouseButton()) {
-       if (GetRenderText()->IsPointInSelection(event.location())) {
-         OnBeforeUserAction();
-@@ -678,7 +678,7 @@
-   if (!textfield)
-     return handled;
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-       ui::GetTextEditKeyBindingsDelegate();
-   std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -805,7 +805,7 @@
- }
- 
- bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Skip any accelerator handling that conflicts with custom keybindings.
-   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-       ui::GetTextEditKeyBindingsDelegate();
-@@ -1061,7 +1061,7 @@
-   scoped_ptr<gfx::Canvas> canvas(
-       GetCanvasForDragImage(GetWidget(), label.size()));
-   label.SetEnabledColor(GetTextColor());
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // Desktop Linux Aura does not yet support transparency in drag images.
-   canvas->DrawColor(GetBackgroundColor());
- #endif
-@@ -1855,7 +1855,7 @@
- }
- 
- void Textfield::UpdateSelectionClipboard() const {
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   if (performing_user_action_ && HasSelection()) {
-     ui::ScopedClipboardWriter(
-         ui::CLIPBOARD_TYPE_SELECTION).WriteText(GetSelectedText());
diff --git a/www/chromium/files/patch-ui__views__controls__webview__webview.gyp b/www/chromium/files/patch-ui__views__controls__webview__webview.gyp
deleted file mode 100644
index 600d010d0c8f..000000000000
--- a/www/chromium/files/patch-ui__views__controls__webview__webview.gyp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/controls/webview/webview.gyp.orig	2016-01-21 20:39:27.633964842 +0100
-+++ ui/views/controls/webview/webview.gyp	2016-01-21 20:39:46.305964070 +0100
-@@ -42,7 +42,7 @@
-         'webview_export.h',
-       ],
-       'conditions': [
--        ['OS=="linux" or OS=="android"', {
-+        ['OS=="linux" or OS=="android" or os_bsd==1', {
-           'sources': [ 'unhandled_keyboard_event_handler_default.cc', ],
-         }],
-       ],
diff --git a/www/chromium/files/patch-ui__views__examples__widget_example.cc b/www/chromium/files/patch-ui__views__examples__widget_example.cc
deleted file mode 100644
index 3e58b3448886..000000000000
--- a/www/chromium/files/patch-ui__views__examples__widget_example.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- ui/views/examples/widget_example.cc.orig	2015-05-13 18:23:12.000000000 -0400
-+++ ui/views/examples/widget_example.cc	2015-05-20 17:45:57.913297000 -0400
-@@ -82,7 +82,7 @@
-   BuildButton(container, "Popup widget", POPUP);
-   BuildButton(container, "Dialog widget", DIALOG);
-   BuildButton(container, "Modal Dialog", MODAL_DIALOG);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
-   // Windows does not support TYPE_CONTROL top-level widgets.
-   BuildButton(container, "Child widget", CHILD);
- #endif
-
diff --git a/www/chromium/files/patch-ui__views__views.gyp b/www/chromium/files/patch-ui__views__views.gyp
deleted file mode 100644
index fb3e81f9cc5f..000000000000
--- a/www/chromium/files/patch-ui__views__views.gyp
+++ /dev/null
@@ -1,20 +0,0 @@
---- ui/views/views.gyp.orig	2015-04-15 00:31:23.000000000 +0200
-+++ ui/views/views.gyp	2015-04-20 21:31:06.000000000 +0200
-@@ -631,7 +631,7 @@
-             '../display/display.gyp:display_util',
-           ],
-         }],
--        ['OS=="linux" and chromeos==0', {
-+        ['(OS=="linux" or os_bsd==1) and chromeos==0', {
-           'dependencies': [
-             '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
-           ],
-@@ -696,7 +696,7 @@
-         ['use_aura and chromeos == 0', {
-           'sources': [ '<@(views_desktop_aura_sources)' ],
-           'conditions': [
--            ['OS == "linux"', {
-+            ['OS == "linux" or os_bsd == 1', {
-               'sources': [ '<@(views_desktop_aura_linux_sources)' ],
-             }],
-             ['use_x11 == 1', {
diff --git a/www/chromium/files/patch-ui__views__views_delegate.cc b/www/chromium/files/patch-ui__views__views_delegate.cc
deleted file mode 100644
index edad3e83bbc5..000000000000
--- a/www/chromium/files/patch-ui__views__views_delegate.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/views_delegate.cc.orig	2015-08-22 15:02:00.000000000 -0400
-+++ ui/views/views_delegate.cc	2015-09-03 11:41:11.900854000 -0400
-@@ -62,7 +62,7 @@
- bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
-   return false;
- }
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
- gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
-   return nullptr;
- }
diff --git a/www/chromium/files/patch-ui__views__views_delegate.h b/www/chromium/files/patch-ui__views__views_delegate.h
deleted file mode 100644
index aed2a96c31c2..000000000000
--- a/www/chromium/files/patch-ui__views__views_delegate.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/views_delegate.h.orig	2015-08-22 15:02:00.000000000 -0400
-+++ ui/views/views_delegate.h	2015-09-03 11:42:15.403898000 -0400
-@@ -110,7 +110,7 @@
-   // Returns true if the window passed in is in the Windows 8 metro
-   // environment.
-   virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD)
-   virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
- #endif
- 
diff --git a/www/chromium/files/patch-ui__views__views_switches.cc b/www/chromium/files/patch-ui__views__views_switches.cc
deleted file mode 100644
index 0024be235b8b..000000000000
--- a/www/chromium/files/patch-ui__views__views_switches.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/views_switches.cc.orig	2015-04-28 07:51:15.723570000 -0400
-+++ ui/views/views_switches.cc	2015-04-28 07:51:39.558227000 -0400
-@@ -26,7 +26,7 @@
- #endif
- 
- bool IsRectBasedTargetingEnabled() {
--#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
-       kDisableViewsRectBasedTargeting);
- #else
diff --git a/www/chromium/files/patch-ui__views__window__custom_frame_view.cc b/www/chromium/files/patch-ui__views__window__custom_frame_view.cc
deleted file mode 100644
index a7428bd4638e..000000000000
--- a/www/chromium/files/patch-ui__views__window__custom_frame_view.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/window/custom_frame_view.cc.orig	2014-10-10 08:54:19 UTC
-+++ ui/views/window/custom_frame_view.cc
-@@ -283,7 +283,7 @@
- int CustomFrameView::CaptionButtonY() const {
-   // Maximized buttons start at window top so that even if their images aren't
-   // drawn flush with the screen edge, they still obey Fitts' Law.
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
-   return FrameBorderThickness();
- #else
-   return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
diff --git a/www/chromium/files/patch-ui__views__window__dialog_delegate.cc b/www/chromium/files/patch-ui__views__window__dialog_delegate.cc
deleted file mode 100644
index b0d3d1ec7783..000000000000
--- a/www/chromium/files/patch-ui__views__window__dialog_delegate.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/views/window/dialog_delegate.cc.orig	2015-04-14 18:19:00.000000000 -0400
-+++ ui/views/window/dialog_delegate.cc	2015-04-28 07:49:18.261990000 -0400
-@@ -48,7 +48,7 @@
-   params.bounds = bounds;
-   DialogDelegate* dialog = delegate->AsDialogDelegate();
- 
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
-   // The new style doesn't support unparented dialogs on Linux desktop.
-   if (dialog)
-     dialog->supports_new_style_ &= parent != NULL;
diff --git a/www/chromium/files/patch-ui__webui__resources__js__cr.js b/www/chromium/files/patch-ui__webui__resources__js__cr.js
deleted file mode 100644
index b6689b56e7b3..000000000000
--- a/www/chromium/files/patch-ui__webui__resources__js__cr.js
+++ /dev/null
@@ -1,13 +0,0 @@
---- ui/webui/resources/js/cr.js.orig	2015-09-05 09:28:39.153643000 -0400
-+++ ui/webui/resources/js/cr.js	2015-09-05 09:29:44.511113000 -0400
-@@ -431,5 +431,10 @@
-     get isLinux() {
-       return /Linux/.test(navigator.userAgent);
-     },
-+    
-+    /** Whether this is on *BSD. */
-+    get isBSD() {
-+      return /BSD/.test(navigator.userAgent);
-+    },
-   };
- }();
diff --git a/www/chromium/files/patch-ui__webui__resources__js__util.js b/www/chromium/files/patch-ui__webui__resources__js__util.js
deleted file mode 100644
index a6d9ef146082..000000000000
--- a/www/chromium/files/patch-ui__webui__resources__js__util.js
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/webui/resources/js/util.js.orig	2015-09-05 09:31:35.172857000 -0400
-+++ ui/webui/resources/js/util.js	2015-09-05 09:31:57.588607000 -0400
-@@ -58,7 +58,7 @@
-  */
- function getSupportedScaleFactors() {
-   var supportedScaleFactors = [];
--  if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) {
-+  if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) {
-     // All desktop platforms support zooming which also updates the
-     // renderer's device scale factors (a.k.a devicePixelRatio), and
-     // these platforms has high DPI assets for 2.0x. Use 1x and 2x in
diff --git a/www/chromium/files/patch-ui_accessibility_accessibility.gyp b/www/chromium/files/patch-ui_accessibility_accessibility.gyp
new file mode 100644
index 000000000000..2176fb46728d
--- /dev/null
+++ b/www/chromium/files/patch-ui_accessibility_accessibility.gyp
@@ -0,0 +1,20 @@
+--- ui/accessibility/accessibility.gyp.orig	2016-05-11 19:02:35 UTC
++++ ui/accessibility/accessibility.gyp
+@@ -64,7 +64,7 @@
+             '../../third_party/iaccessible2/iaccessible2.gyp:iaccessible2'
+           ],
+         }],
+-        ['OS=="linux" and chromeos==0 and use_x11==1', {
++        ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_x11==1', {
+           'dependencies': [
+             '../../build/linux/system.gyp:atk',
+             '../../build/linux/system.gyp:gconf',
+@@ -81,7 +81,7 @@
+             ],
+           },
+         }],
+-        ['OS!="linux" or chromeos==1 or use_x11==0', {
++        ['(OS!="linux" and os_bsd==0) or chromeos==1 or use_x11==0', {
+           'sources!': [
+             'platform/ax_platform_node_auralinux.cc',
+             'platform/ax_platform_node_auralinux.h',
diff --git a/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h b/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h
new file mode 100644
index 000000000000..63d166f7751f
--- /dev/null
+++ b/www/chromium/files/patch-ui_accessibility_platform_ax__platform__node.h
@@ -0,0 +1,11 @@
+--- ui/accessibility/platform/ax_platform_node.h.orig	2016-05-11 19:02:35 UTC
++++ ui/accessibility/platform/ax_platform_node.h
+@@ -22,7 +22,7 @@
+ #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_X11)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && defined(USE_X11)
+ #define PLATFORM_HAS_AX_PLATFORM_NODE_IMPL 1
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_app__list_app__list__constants.cc b/www/chromium/files/patch-ui_app__list_app__list__constants.cc
new file mode 100644
index 000000000000..6c3ad07146dc
--- /dev/null
+++ b/www/chromium/files/patch-ui_app__list_app__list__constants.cc
@@ -0,0 +1,11 @@
+--- ui/app_list/app_list_constants.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/app_list/app_list_constants.cc
+@@ -144,7 +144,7 @@ const char kSearchQueryLength[] = "Apps.
+ const char kSearchResultDistanceFromOrigin[] =
+     "Apps.AppListSearchResultDistanceFromOrigin";
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ #if defined(GOOGLE_CHROME_BUILD)
+ const char kAppListWMClass[] = "chrome_app_list";
+ #else  // CHROMIUM_BUILD
diff --git a/www/chromium/files/patch-ui_app__list_app__list__constants.h b/www/chromium/files/patch-ui_app__list_app__list__constants.h
new file mode 100644
index 000000000000..6fa672330a65
--- /dev/null
+++ b/www/chromium/files/patch-ui_app__list_app__list__constants.h
@@ -0,0 +1,13 @@
+--- ui/app_list/app_list_constants.h.orig	2016-03-25 13:05:03 UTC
++++ ui/app_list/app_list_constants.h
+@@ -92,8 +92,8 @@ APP_LIST_EXPORT extern const char kSearc
+ APP_LIST_EXPORT extern const char kSearchQueryLength[];
+ APP_LIST_EXPORT extern const char kSearchResultDistanceFromOrigin[];
+ 
+-#if defined(OS_LINUX)
+-// The WM_CLASS name for the app launcher window on Linux.
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
++// The WM_CLASS name for the app launcher window on Linux/FreeBSD.
+ APP_LIST_EXPORT extern const char kAppListWMClass[];
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_app__list_app__list__menu.cc b/www/chromium/files/patch-ui_app__list_app__list__menu.cc
new file mode 100644
index 000000000000..0d27b8827d81
--- /dev/null
+++ b/www/chromium/files/patch-ui_app__list_app__list__menu.cc
@@ -0,0 +1,11 @@
+--- ui/app_list/app_list_menu.cc.orig	2016-03-25 13:05:03 UTC
++++ ui/app_list/app_list_menu.cc
+@@ -35,7 +35,7 @@ void AppListMenu::InitMenu() {
+                                users_[i].email.empty() ? users_[i].name
+                                                        : users_[i].email,
+                                0 /* group_id */);
+-#elif defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#elif defined(OS_WIN) || ((defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS))
+       menu_model_.AddItem(SELECT_PROFILE + i, users_[i].name);
+       int menu_index = menu_model_.GetIndexOfCommandId(SELECT_PROFILE + i);
+       menu_model_.SetSublabel(menu_index, users_[i].email);
diff --git a/www/chromium/files/patch-ui_app__list_views_app__list__view.cc b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc
new file mode 100644
index 000000000000..9687ce8b664c
--- /dev/null
+++ b/www/chromium/files/patch-ui_app__list_views_app__list__view.cc
@@ -0,0 +1,20 @@
+--- ui/app_list/views/app_list_view.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/app_list/views/app_list_view.cc
+@@ -80,7 +80,7 @@ bool SupportsShadow() {
+           ::switches::kDisableDwmComposition)) {
+     return false;
+   }
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Shadows are not supported on (non-ChromeOS) Linux.
+   return false;
+ #endif
+@@ -606,7 +606,7 @@ void AppListView::OnBeforeBubbleWidgetIn
+   // the taskbar for these versions of Windows.
+   if (base::win::GetVersion() >= base::win::VERSION_WIN7)
+     params->force_show_in_taskbar = true;
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+   // Set up a custom WM_CLASS for the app launcher window. This allows task
+   // switchers in X11 environments to distinguish it from main browser windows.
+   params->wm_class_name = kAppListWMClass;
diff --git a/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
new file mode 100644
index 000000000000..83b84484a634
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_ime_ime__engine__handler__interface.h
@@ -0,0 +1,11 @@
+--- ui/base/ime/ime_engine_handler_interface.h.orig	2016-04-08 16:02:15 UTC
++++ ui/base/ime/ime_engine_handler_interface.h
+@@ -138,7 +138,7 @@ class UI_BASE_IME_EXPORT IMEEngineHandle
+   // Hides the input view window (from API call).
+   virtual void HideInputView() = 0;
+ 
+-#elif defined(OS_LINUX) || defined(OS_WIN)
++#elif defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+ 
+   // Get the id of the IME extension.
+   virtual std::string GetExtensionId() const = 0;
diff --git a/www/chromium/files/patch-ui_base_ime_input__method__factory.cc b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc
new file mode 100644
index 000000000000..22447744b9bf
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_ime_input__method__factory.cc
@@ -0,0 +1,20 @@
+--- ui/base/ime/input_method_factory.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/base/ime/input_method_factory.cc
+@@ -14,7 +14,7 @@
+ #elif defined(OS_MACOSX)
+ #include "ui/base/ime/input_method_mac.h"
+ #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
+-      !defined(OS_CHROMEOS)
++      !defined(OS_CHROMEOS) || defined(OS_BSD)
+ #include "ui/base/ime/input_method_auralinux.h"
+ #elif defined(OS_ANDROID)
+ #include "ui/base/ime/input_method_android.h"
+@@ -56,7 +56,7 @@ scoped_ptr<InputMethod> CreateInputMetho
+ #elif defined(OS_MACOSX)
+   return make_scoped_ptr(new InputMethodMac(delegate));
+ #elif defined(USE_AURA) && defined(OS_LINUX) && defined(USE_X11) && \
+-      !defined(OS_CHROMEOS)
++      !defined(OS_CHROMEOS) || defined(OS_BSD)
+   return make_scoped_ptr(new InputMethodAuraLinux(delegate));
+ #elif defined(OS_ANDROID)
+   return make_scoped_ptr(new InputMethodAndroid(delegate));
diff --git a/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
new file mode 100644
index 000000000000..8de491922807
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_ime_input__method__initializer.cc
@@ -0,0 +1,37 @@
+--- ui/base/ime/input_method_initializer.cc.orig	2016-03-25 13:05:03 UTC
++++ ui/base/ime/input_method_initializer.cc
+@@ -8,14 +8,14 @@
+ 
+ #if defined(OS_CHROMEOS)
+ #include "ui/base/ime/ime_bridge.h"
+-#elif defined(USE_AURA) && defined(OS_LINUX)
++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+ #include "base/logging.h"
+ #include "ui/base/ime/linux/fake_input_method_context_factory.h"
+ #endif
+ 
+ namespace {
+ 
+-#if !defined(OS_CHROMEOS) && defined(USE_AURA) && defined(OS_LINUX)
++#if !defined(OS_CHROMEOS) && defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+ const ui::LinuxInputMethodContextFactory* g_linux_input_method_context_factory;
+ #endif
+ 
+@@ -38,7 +38,7 @@ void ShutdownInputMethod() {
+ void InitializeInputMethodForTesting() {
+ #if defined(OS_CHROMEOS)
+   IMEBridge::Initialize();
+-#elif defined(USE_AURA) && defined(OS_LINUX)
++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD))
+   if (!g_linux_input_method_context_factory)
+     g_linux_input_method_context_factory = new FakeInputMethodContextFactory();
+   const LinuxInputMethodContextFactory* factory =
+@@ -54,7 +54,7 @@ void InitializeInputMethodForTesting() {
+ void ShutdownInputMethodForTesting() {
+ #if defined(OS_CHROMEOS)
+   IMEBridge::Shutdown();
+-#elif defined(USE_AURA) && defined(OS_LINUX)
++#elif defined(USE_AURA) && (defined(OS_LINUX) || defined(OS_BSD)) 
+   const LinuxInputMethodContextFactory* factory =
+       LinuxInputMethodContextFactory::instance();
+   CHECK(!factory || factory == g_linux_input_method_context_factory)
diff --git a/www/chromium/files/patch-ui_base_resource_resource__bundle.cc b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
new file mode 100644
index 000000000000..c31981d8fe8f
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_resource_resource__bundle.cc
@@ -0,0 +1,20 @@
+--- ui/base/resource/resource_bundle.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/base/resource/resource_bundle.cc
+@@ -612,7 +612,7 @@ void ResourceBundle::ReloadFonts() {
+ }
+ 
+ ScaleFactor ResourceBundle::GetMaxScaleFactor() const {
+-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   return max_scale_factor_;
+ #else
+   return GetSupportedScaleFactors().back();
+@@ -674,7 +674,7 @@ void ResourceBundle::InitSharedInstance(
+ #elif defined(OS_MACOSX)
+   if (base::mac::IsOSLionOrLater())
+     supported_scale_factors.push_back(SCALE_FACTOR_200P);
+-#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN)
++#elif defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_WIN) || defined(OS_BSD)
+   supported_scale_factors.push_back(SCALE_FACTOR_200P);
+ #endif
+   ui::SetSupportedScaleFactors(supported_scale_factors);
diff --git a/www/chromium/files/patch-ui_base_ui__base.gyp b/www/chromium/files/patch-ui_base_ui__base.gyp
new file mode 100644
index 000000000000..64535b07ee0a
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_ui__base.gyp
@@ -0,0 +1,29 @@
+--- ui/base/ui_base.gyp.orig	2016-05-11 19:02:35 UTC
++++ ui/base/ui_base.gyp
+@@ -454,7 +454,7 @@
+             'x/selection_utils.h',
+           ]
+         }],
+-        ['use_aura==0 or OS!="linux"', {
++        ['use_aura==0 or (OS!="linux" and os_bsd!=1)', {
+           'sources!': [
+             'resource/resource_bundle_auralinux.cc',
+           ],
+@@ -477,7 +477,7 @@
+             '../../build/linux/system.gyp:glib',
+           ],
+         }],
+-        ['OS=="linux"', {
++        ['OS=="linux" or os_bsd==1', {
+           'conditions': [
+             ['toolkit_views==0 and use_aura==0', {
+               # Note: because of gyp predence rules this has to be defined as
+@@ -510,7 +510,7 @@
+             'clipboard/clipboard_aurax11.cc',
+           ],
+         }],
+-        ['chromeos==1 or (use_aura==1 and OS=="linux" and use_x11==0)', {
++        ['chromeos==1 or (use_aura==1 and (OS=="linux" or os_bsd==1) and use_x11==0)', {
+           'sources!': [
+             'dragdrop/os_exchange_data_provider_aurax11.cc',
+           ],
diff --git a/www/chromium/files/patch-ui_base_webui_web__ui__util.cc b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
new file mode 100644
index 000000000000..0871f06fedcf
--- /dev/null
+++ b/www/chromium/files/patch-ui_base_webui_web__ui__util.cc
@@ -0,0 +1,11 @@
+--- ui/base/webui/web_ui_util.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/base/webui/web_ui_util.cc
+@@ -164,7 +164,7 @@ std::string GetFontFamily() {
+ 
+ // TODO(dnicoara) Remove Ozone check when PlatformFont support is introduced
+ // into Ozone: crbug.com/320050
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) && !defined(USE_OZONE)
+   font_family = ui::ResourceBundle::GetSharedInstance().GetFont(
+       ui::ResourceBundle::BaseFont).GetFontName() + ", " + font_family;
+ #endif
diff --git a/www/chromium/files/patch-ui_events_event__switches.cc b/www/chromium/files/patch-ui_events_event__switches.cc
new file mode 100644
index 000000000000..443a7ecefbb8
--- /dev/null
+++ b/www/chromium/files/patch-ui_events_event__switches.cc
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.cc.orig	2016-03-25 13:05:03 UTC
++++ ui/events/event_switches.cc
+@@ -28,7 +28,7 @@ const char kTouchEventsDisabled[] = "dis
+ const char kCompensateForUnstablePinchZoom[] =
+     "compensate-for-unstable-pinch-zoom";
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ // Tells chrome to interpret events from these devices as touch events. Only
+ // available with XInput 2 (i.e. X server 1.8 or above). The id's of the
+ // devices can be retrieved from 'xinput list'.
diff --git a/www/chromium/files/patch-ui_events_event__switches.h b/www/chromium/files/patch-ui_events_event__switches.h
new file mode 100644
index 000000000000..54bf7d742628
--- /dev/null
+++ b/www/chromium/files/patch-ui_events_event__switches.h
@@ -0,0 +1,11 @@
+--- ui/events/event_switches.h.orig	2016-03-25 13:05:03 UTC
++++ ui/events/event_switches.h
+@@ -18,7 +18,7 @@ EVENTS_BASE_EXPORT extern const char kTo
+ EVENTS_BASE_EXPORT extern const char kTouchEventsDisabled[];
+ EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[];
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_FREEBSD)
+ EVENTS_BASE_EXPORT extern const char kTouchDevices[];
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
new file mode 100644
index 000000000000..a1418adfd1ec
--- /dev/null
+++ b/www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc
@@ -0,0 +1,11 @@
+--- ui/events/keycodes/dom/keycode_converter.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/events/keycodes/dom/keycode_converter.cc
+@@ -19,7 +19,7 @@ namespace {
+ // and DOM Level 3 |code| strings.
+ #if defined(OS_WIN)
+ #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, win, code}
+-#elif defined(OS_LINUX)
++#elif defined(OS_LINUX) || defined(OS_BSD)
+ #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, xkb, code}
+ #elif defined(OS_MACOSX)
+ #define USB_KEYMAP(usb, evdev, xkb, win, mac, code, id) {usb, mac, code}
diff --git a/www/chromium/files/patch-ui_gfx_canvas__skia.cc b/www/chromium/files/patch-ui_gfx_canvas__skia.cc
new file mode 100644
index 000000000000..13d0f5599a54
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_canvas__skia.cc
@@ -0,0 +1,11 @@
+--- ui/gfx/canvas_skia.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/gfx/canvas_skia.cc
+@@ -246,7 +246,7 @@ void Canvas::DrawStringRectWithShadows(c
+     Range range = StripAcceleratorChars(flags, &adjusted_text);
+     bool elide_text = ((flags & NO_ELLIPSIS) == 0);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     // On Linux, eliding really means fading the end of the string. But only
+     // for LTR text. RTL text is still elided (on the left) with "...".
+     if (elide_text) {
diff --git a/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
new file mode 100644
index 000000000000..5883718bd381
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_font__fallback__linux.cc
@@ -0,0 +1,13 @@
+--- ui/gfx/font_fallback_linux.cc.orig	2016-05-27 10:26:15.843855000 -0400
++++ ui/gfx/font_fallback_linux.cc	2016-05-27 10:26:38.723265000 -0400
+@@ -15,6 +15,10 @@
+ #include "base/memory/ptr_util.h"
+ #include "ui/gfx/font.h"
+ 
++#if defined(OS_BSD)
++#  include <unistd.h>
++#endif
++
+ namespace gfx {
+ 
+ namespace {
diff --git a/www/chromium/files/patch-ui_gfx_font__render__params.h b/www/chromium/files/patch-ui_gfx_font__render__params.h
new file mode 100644
index 000000000000..5aa8fa16315b
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_font__render__params.h
@@ -0,0 +1,18 @@
+--- ui/gfx/font_render_params.h.orig	2016-05-27 10:24:30.925944000 -0400
++++ ui/gfx/font_render_params.h	2016-05-27 10:24:56.069225000 -0400
+@@ -102,13 +102,13 @@
+     const FontRenderParamsQuery& query,
+     std::string* family_out);
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // Clears GetFontRenderParams()'s cache. Intended to be called by tests that are
+ // changing Fontconfig's configuration.
+ GFX_EXPORT void ClearFontRenderParamsCacheForTest();
+ #endif
+ 
+-#if defined(OS_CHROMEOS) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_LINUX) || defined(OS_BSD)
+ // Gets the device scale factor to query the FontRenderParams.
+ GFX_EXPORT float GetFontRenderParamsDeviceScaleFactor();
+ 
diff --git a/www/chromium/files/patch-ui_gfx_render__text.cc b/www/chromium/files/patch-ui_gfx_render__text.cc
new file mode 100644
index 000000000000..2262a9a77f0b
--- /dev/null
+++ b/www/chromium/files/patch-ui_gfx_render__text.cc
@@ -0,0 +1,46 @@
+--- ui/gfx/render_text.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/gfx/render_text.cc
+@@ -942,32 +942,33 @@ void RenderText::SetDisplayOffset(int ho
+   const int extra_content = GetContentWidth() - display_rect_.width();
+   const int cursor_width = cursor_enabled_ ? 1 : 0;
+ 
+-  int min_offset = 0;
+-  int max_offset = 0;
++  // avoid collisions with vm_map.h on FreeBSD --cmt
++  int _min_offset = 0;
++  int _max_offset = 0;
+   if (extra_content > 0) {
+     switch (GetCurrentHorizontalAlignment()) {
+       case ALIGN_LEFT:
+-        min_offset = -extra_content;
++        _min_offset = -extra_content;
+         break;
+       case ALIGN_RIGHT:
+-        max_offset = extra_content;
++        _max_offset = extra_content;
+         break;
+       case ALIGN_CENTER:
+         // The extra space reserved for cursor at the end of the text is ignored
+         // when centering text. So, to calculate the valid range for offset, we
+         // exclude that extra space, calculate the range, and add it back to the
+         // range (if cursor is enabled).
+-        min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width;
+-        max_offset = (extra_content - cursor_width) / 2;
++        _min_offset = -(extra_content - cursor_width + 1) / 2 - cursor_width;
++        _max_offset = (extra_content - cursor_width) / 2;
+         break;
+       default:
+         break;
+     }
+   }
+-  if (horizontal_offset < min_offset)
+-    horizontal_offset = min_offset;
+-  else if (horizontal_offset > max_offset)
+-    horizontal_offset = max_offset;
++  if (horizontal_offset < _min_offset)
++    horizontal_offset = _min_offset;
++  else if (horizontal_offset > _max_offset)
++    horizontal_offset = _max_offset;
+ 
+   cached_bounds_and_offset_valid_ = true;
+   display_offset_.set_x(horizontal_offset);
diff --git a/www/chromium/files/patch-ui_gl_gl.gyp b/www/chromium/files/patch-ui_gl_gl.gyp
new file mode 100644
index 000000000000..bfd5ff2530f6
--- /dev/null
+++ b/www/chromium/files/patch-ui_gl_gl.gyp
@@ -0,0 +1,20 @@
+--- ui/gl/gl.gyp.orig	2016-05-11 19:02:35 UTC
++++ ui/gl/gl.gyp
+@@ -130,7 +130,7 @@
+         'trace_util.h',
+       ],
+       'conditions': [
+-        ['OS in ("win", "android", "linux")', {
++        ['OS in ("win", "android", "linux", "freebsd", "openbsd")', {
+           'sources': [
+             'egl_util.cc',
+             'egl_util.h',
+@@ -151,7 +151,7 @@
+             '<(DEPTH)/third_party/khronos',
+         ],
+         }],
+-        ['OS in ("android", "linux")', {
++        ['OS in ("android", "linux", "freebsd", "openbsd")', {
+           'sources': [
+             'gl_implementation_osmesa.cc',
+             'gl_implementation_osmesa.h',
diff --git a/www/chromium/files/patch-ui_gl_gl__surface__glx.cc b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
new file mode 100644
index 000000000000..64773975d47e
--- /dev/null
+++ b/www/chromium/files/patch-ui_gl_gl__surface__glx.cc
@@ -0,0 +1,11 @@
+--- ui/gl/gl_surface_glx.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/gl/gl_surface_glx.cc
+@@ -48,7 +48,7 @@ bool g_glx_get_msc_rate_oml_supported = 
+ bool g_glx_sgi_video_sync_supported = false;
+ 
+ static const int kGetVSyncParametersMinSeconds =
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+     // See crbug.com/373489
+     // On Linux, querying the vsync parameters might burn CPU for up to an
+     // entire vsync, so we only query periodically to reduce CPU usage.
diff --git a/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
new file mode 100644
index 000000000000..e0971f3db0b5
--- /dev/null
+++ b/www/chromium/files/patch-ui_gl_sync__control__vsync__provider.cc
@@ -0,0 +1,29 @@
+--- ui/gl/sync_control_vsync_provider.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/gl/sync_control_vsync_provider.cc
+@@ -11,7 +11,7 @@
+ #include "base/trace_event/trace_event.h"
+ #include "build/build_config.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ // These constants define a reasonable range for a calculated refresh interval.
+ // Calculating refreshes out of this range will be considered a fatal error.
+ const int64_t kMinVsyncIntervalUs = base::Time::kMicrosecondsPerSecond / 400;
+@@ -38,7 +38,7 @@ SyncControlVSyncProvider::~SyncControlVS
+ void SyncControlVSyncProvider::GetVSyncParameters(
+     const UpdateVSyncCallback& callback) {
+   TRACE_EVENT0("gpu", "SyncControlVSyncProvider::GetVSyncParameters");
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   base::TimeTicks timebase;
+ 
+   // The actual clock used for the system time returned by glXGetSyncValuesOML
+@@ -154,7 +154,7 @@ void SyncControlVSyncProvider::GetVSyncP
+   last_timebase_ = timebase;
+   last_media_stream_counter_ = media_stream_counter;
+   callback.Run(timebase, last_good_interval_);
+-#endif  // defined(OS_LINUX)
++#endif  // defined(OS_LINUX) || defined(OS_BSD)
+ }
+ 
+ }  // namespace gfx
diff --git a/www/chromium/files/patch-ui_message__center_message__center__style.h b/www/chromium/files/patch-ui_message__center_message__center__style.h
new file mode 100644
index 000000000000..a0e90ae2b687
--- /dev/null
+++ b/www/chromium/files/patch-ui_message__center_message__center__style.h
@@ -0,0 +1,11 @@
+--- ui/message_center/message_center_style.h.orig	2016-05-11 19:02:35 UTC
++++ ui/message_center/message_center_style.h
+@@ -111,7 +111,7 @@ const int kButtonHorizontalPadding = 16;
+ const int kButtonIconTopPadding = 11;      // In DIPs.
+ const int kButtonIconToTitlePadding = 16;  // In DIPs.
+ 
+-#if !defined(OS_LINUX) || defined(USE_AURA)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(USE_AURA)
+ const SkColor kButtonSeparatorColor = SkColorSetRGB(234, 234, 234);
+ const SkColor kHoveredButtonBackgroundColor = SkColorSetRGB(243, 243, 243);
+ #endif
diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc
new file mode 100644
index 000000000000..b69a146d6c71
--- /dev/null
+++ b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.cc
@@ -0,0 +1,47 @@
+--- ui/message_center/views/message_center_button_bar.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/message_center/views/message_center_button_bar.cc
+@@ -96,7 +96,7 @@ MessageCenterButtonBar::MessageCenterBut
+     const base::string16& title)
+     : message_center_view_(message_center_view),
+       message_center_(message_center),
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+       close_bubble_button_(NULL),
+ #endif
+       title_arrow_(NULL),
+@@ -171,7 +171,7 @@ MessageCenterButtonBar::MessageCenterBut
+                                    IDS_MESSAGE_CENTER_SETTINGS_BUTTON_LABEL);
+   button_container_->AddChildView(settings_button_);
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   close_bubble_button_ = new views::ImageButton(this);
+   close_bubble_button_->SetImage(
+       views::Button::STATE_NORMAL,
+@@ -233,7 +233,7 @@ void MessageCenterButtonBar::ViewVisibil
+                     0,
+                     0);
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // The close-bubble button.
+   column->AddColumn(views::GridLayout::LEADING,
+                     views::GridLayout::LEADING,
+@@ -248,7 +248,7 @@ void MessageCenterButtonBar::ViewVisibil
+     layout->AddView(title_arrow_);
+   layout->AddView(notification_label_);
+   layout->AddView(button_container_);
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   layout->AddView(close_bubble_button_);
+ #endif
+ }
+@@ -295,7 +295,7 @@ void MessageCenterButtonBar::ButtonPress
+     else
+       message_center()->EnterQuietModeWithExpire(base::TimeDelta::FromDays(1));
+     quiet_mode_button_->SetToggled(message_center()->IsQuietMode());
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   } else if (sender == close_bubble_button_) {
+     message_center_view()->tray()->HideMessageCenterBubble();
+ #endif
diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h
new file mode 100644
index 000000000000..a427c298d82b
--- /dev/null
+++ b/www/chromium/files/patch-ui_message__center_views_message__center__button__bar.h
@@ -0,0 +1,11 @@
+--- ui/message_center/views/message_center_button_bar.h.orig	2016-04-08 16:02:15 UTC
++++ ui/message_center/views/message_center_button_bar.h
+@@ -73,7 +73,7 @@ class MessageCenterButtonBar : public vi
+   // close-on-deactivation is off. This is a tentative solution. Once pkotwicz
+   // Fixes the problem of focus-follow-mouse, close-on-deactivation will be
+   // back and this field will be removed. See crbug.com/319516.
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   views::ImageButton* close_bubble_button_;
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_message__center_views_message__center__view.cc b/www/chromium/files/patch-ui_message__center_views_message__center__view.cc
new file mode 100644
index 000000000000..04e4e1ad8373
--- /dev/null
+++ b/www/chromium/files/patch-ui_message__center_views_message__center__view.cc
@@ -0,0 +1,20 @@
+--- ui/message_center/views/message_center_view.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/message_center/views/message_center_view.cc
+@@ -44,7 +44,7 @@ namespace message_center {
+ namespace {
+ 
+ const SkColor kNoNotificationsTextColor = SkColorSetRGB(0xb4, 0xb4, 0xb4);
+-#if defined(OS_LINUX) && defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS)
+ const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0);
+ #endif
+ 
+@@ -82,7 +82,7 @@ NoNotificationMessageView::NoNotificatio
+   label_->SetEnabledColor(kNoNotificationsTextColor);
+   // Set transparent background to ensure that subpixel rendering
+   // is disabled. See crbug.com/169056
+-#if defined(OS_LINUX) && defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(OS_CHROMEOS)
+   label_->SetBackgroundColor(kTransparentColor);
+ #endif
+   AddChildView(label_);
diff --git a/www/chromium/files/patch-ui_message__center_views_notification__view.cc b/www/chromium/files/patch-ui_message__center_views_notification__view.cc
new file mode 100644
index 000000000000..e81df85cfe8c
--- /dev/null
+++ b/www/chromium/files/patch-ui_message__center_views_notification__view.cc
@@ -0,0 +1,11 @@
+--- ui/message_center/views/notification_view.cc.orig	2016-05-11 19:02:35 UTC
++++ ui/message_center/views/notification_view.cc
+@@ -199,7 +199,7 @@ NotificationView* NotificationView::Crea
+   NotificationView* notification_view =
+       new NotificationView(controller, notification);
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Don't create shadows for notification toasts on linux wih aura.
+   if (top_level)
+     return notification_view;
diff --git a/www/chromium/files/patch-ui_resources_ui__resources.grd b/www/chromium/files/patch-ui_resources_ui__resources.grd
new file mode 100644
index 000000000000..974d89a8de59
--- /dev/null
+++ b/www/chromium/files/patch-ui_resources_ui__resources.grd
@@ -0,0 +1,11 @@
+--- ui/resources/ui_resources.grd.orig	2016-05-11 19:02:35 UTC
++++ ui/resources/ui_resources.grd
+@@ -15,7 +15,7 @@
+       <!-- KEEP THESE IN ALPHABETICAL ORDER!  DO NOT ADD TO RANDOM PLACES JUST
+            BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
+            SAME CONDITIONALS. -->
+-      <if expr="is_linux and use_aura">
++      <if expr="(is_linux or is_bsd) and use_aura">
+         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_ALIAS" file="common/pointers/alias_big.png" />
+         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_CELL" file="common/pointers/cell_big.png" />
+         <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_BIG_COL_RESIZE" file="common/pointers/sb_h_double_arrow_big.png" />
diff --git a/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
new file mode 100644
index 000000000000..2bb15b5b9389
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_accessibility_native__view__accessibility.h
@@ -0,0 +1,11 @@
+--- ui/views/accessibility/native_view_accessibility.h.orig	2016-03-25 13:05:04 UTC
++++ ui/views/accessibility/native_view_accessibility.h
+@@ -22,7 +22,7 @@
+ #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
+ #endif
+ 
+-#if defined(OS_LINUX) && defined(USE_X11) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_X11) && !defined(OS_CHROMEOS)
+ #define PLATFORM_HAS_NATIVE_VIEW_ACCESSIBILITY_IMPL 1
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc b/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc
new file mode 100644
index 000000000000..1dd279f82574
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_bubble_bubble__delegate.cc
@@ -0,0 +1,11 @@
+--- ui/views/bubble/bubble_delegate.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/bubble/bubble_delegate.cc
+@@ -96,7 +96,7 @@ Widget* BubbleDelegateView::CreateBubble
+   // the parent frame and let DWM handle compositing.  If not, then we don't
+   // want to allow the bubble to extend the frame because it will be clipped.
+   bubble_delegate->set_adjust_if_offscreen(ui::win::IsAeroGlassEnabled());
+-#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_MACOSX) || defined(OS_BSD)
+   // Linux clips bubble windows that extend outside their parent window bounds.
+   // Mac never adjusts.
+   bubble_delegate->set_adjust_if_offscreen(false);
diff --git a/www/chromium/files/patch-ui_views_controls_button_label__button.cc b/www/chromium/files/patch-ui_views_controls_button_label__button.cc
new file mode 100644
index 000000000000..3b3c6ad92456
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_controls_button_label__button.cc
@@ -0,0 +1,20 @@
+--- ui/views/controls/button/label_button.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/controls/button/label_button.cc
+@@ -30,7 +30,7 @@ namespace {
+ // The default spacing between the icon and text.
+ const int kSpacing = 5;
+ 
+-#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS))
+ // Default text and shadow colors for STYLE_BUTTON.
+ const SkColor kStyleButtonTextColor = SK_ColorBLACK;
+ const SkColor kStyleButtonShadowColor = SK_ColorWHITE;
+@@ -482,7 +482,7 @@ void LabelButton::ResetColorsFromNativeT
+     // confusion. These details should either be pushed into ui::NativeThemeWin
+     // or should be obsoleted by rendering buttons with paint calls instead of
+     // with static assets. http://crbug.com/350498
+-#if !(defined(OS_LINUX) && !defined(OS_CHROMEOS))
++#if !((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS))
+     constant_text_color = true;
+     colors[STATE_NORMAL] = kStyleButtonTextColor;
+     label_->SetBackgroundColor(theme->GetSystemColor(
diff --git a/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc b/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc
new file mode 100644
index 000000000000..7742a6384d4a
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_controls_scrollbar_base__scroll__bar.cc
@@ -0,0 +1,11 @@
+--- ui/views/controls/scrollbar/base_scroll_bar.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/controls/scrollbar/base_scroll_bar.cc
+@@ -24,7 +24,7 @@
+ #include "ui/views/controls/scrollbar/base_scroll_bar_thumb.h"
+ #include "ui/views/widget/widget.h"
+ 
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+ #include "ui/gfx/screen.h"
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
new file mode 100644
index 000000000000..a6ec31a9c5ce
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -0,0 +1,83 @@
+--- ui/views/controls/textfield/textfield.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/controls/textfield/textfield.cc
+@@ -47,7 +47,7 @@
+ #include "base/win/win_util.h"
+ #endif
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ #include "base/strings/utf_string_conversions.h"
+ #include "ui/events/linux/text_edit_command_auralinux.h"
+ #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h"
+@@ -130,7 +130,7 @@ int GetCommandForKeyEvent(const ui::KeyE
+     case ui::VKEY_BACK:
+       if (!control || has_selection)
+         return IDS_DELETE_BACKWARD;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       // Only erase by line break on Linux and ChromeOS.
+       if (shift)
+         return IDS_DELETE_TO_BEGINNING_OF_LINE;
+@@ -139,7 +139,7 @@ int GetCommandForKeyEvent(const ui::KeyE
+     case ui::VKEY_DELETE:
+       if (!control || has_selection)
+         return (shift && has_selection) ? IDS_APP_CUT : IDS_DELETE_FORWARD;
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+       // Only erase by line break on Linux and ChromeOS.
+       if (shift)
+         return IDS_DELETE_TO_END_OF_LINE;
+@@ -154,7 +154,7 @@ int GetCommandForKeyEvent(const ui::KeyE
+   }
+ }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+ // Convert a custom text edit |command| to the equivalent views command ID.
+ int GetViewsCommand(const ui::TextEditCommandAuraLinux& command, bool rtl) {
+   const bool select = command.extend_selection();
+@@ -642,7 +642,7 @@ bool Textfield::OnMousePressed(const ui:
+       OnAfterUserAction();
+     }
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+     if (event.IsOnlyMiddleMouseButton()) {
+       if (GetRenderText()->IsPointInSelection(event.location())) {
+         OnBeforeUserAction();
+@@ -711,7 +711,7 @@ bool Textfield::OnKeyPressed(const ui::K
+   if (!textfield)
+     return handled;
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
+       ui::GetTextEditKeyBindingsDelegate();
+   std::vector<ui::TextEditCommandAuraLinux> commands;
+@@ -846,7 +846,7 @@ void Textfield::AboutToRequestFocusFromT
+ }
+ 
+ bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Skip any accelerator handling that conflicts with custom keybindings.
+   ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
+       ui::GetTextEditKeyBindingsDelegate();
+@@ -1105,7 +1105,7 @@ void Textfield::WriteDragDataForView(Vie
+   scoped_ptr<gfx::Canvas> canvas(
+       GetCanvasForDragImage(GetWidget(), label.size()));
+   label.SetEnabledColor(GetTextColor());
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // Desktop Linux Aura does not yet support transparency in drag images.
+   canvas->DrawColor(GetBackgroundColor());
+ #endif
+@@ -1880,7 +1880,7 @@ void Textfield::CreateTouchSelectionCont
+ }
+ 
+ void Textfield::UpdateSelectionClipboard() const {
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   if (performing_user_action_ && HasSelection()) {
+     ui::ScopedClipboardWriter(
+         ui::CLIPBOARD_TYPE_SELECTION).WriteText(GetSelectedText());
diff --git a/www/chromium/files/patch-ui_views_controls_webview_webview.gyp b/www/chromium/files/patch-ui_views_controls_webview_webview.gyp
new file mode 100644
index 000000000000..7fdff669581b
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_controls_webview_webview.gyp
@@ -0,0 +1,11 @@
+--- ui/views/controls/webview/webview.gyp.orig	2016-03-25 13:05:04 UTC
++++ ui/views/controls/webview/webview.gyp
+@@ -42,7 +42,7 @@
+         'webview_export.h',
+       ],
+       'conditions': [
+-        ['OS=="linux" or OS=="android"', {
++        ['OS=="linux" or OS=="android" or os_bsd==1', {
+           'sources': [ 'unhandled_keyboard_event_handler_default.cc', ],
+         }],
+       ],
diff --git a/www/chromium/files/patch-ui_views_examples_widget__example.cc b/www/chromium/files/patch-ui_views_examples_widget__example.cc
new file mode 100644
index 000000000000..9d5ce30c90d4
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_examples_widget__example.cc
@@ -0,0 +1,11 @@
+--- ui/views/examples/widget_example.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/examples/widget_example.cc
+@@ -84,7 +84,7 @@ void WidgetExample::CreateExampleView(Vi
+   BuildButton(container, "Popup widget", POPUP);
+   BuildButton(container, "Dialog widget", DIALOG);
+   BuildButton(container, "Modal Dialog", MODAL_DIALOG);
+-#if defined(OS_LINUX)
++#if defined(OS_LINUX) || defined(OS_BSD)
+   // Windows does not support TYPE_CONTROL top-level widgets.
+   BuildButton(container, "Child widget", CHILD);
+ #endif
diff --git a/www/chromium/files/patch-ui_views_style_platform__style.cc b/www/chromium/files/patch-ui_views_style_platform__style.cc
new file mode 100644
index 000000000000..dead73f8c8c6
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_style_platform__style.cc
@@ -0,0 +1,11 @@
+--- ui/views/style/platform_style.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/style/platform_style.cc
+@@ -34,7 +34,7 @@ scoped_ptr<ScrollBar> PlatformStyle::Cre
+ 
+ #endif
+ 
+-#if !defined(OS_LINUX) || defined(OS_CHROMEOS)
++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS)
+ // static
+ scoped_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder(
+     LabelButton* button) {
diff --git a/www/chromium/files/patch-ui_views_views.gyp b/www/chromium/files/patch-ui_views_views.gyp
new file mode 100644
index 000000000000..fae217585cca
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_views.gyp
@@ -0,0 +1,26 @@
+--- ui/views/views.gyp.orig	2016-05-11 19:02:36 UTC
++++ ui/views/views.gyp
+@@ -693,12 +693,12 @@
+             '../display/display.gyp:display_util',
+           ],
+         }],
+-        ['OS=="linux" and chromeos==0 and use_ozone==0', {
++        ['(OS=="linux" or os_bsd==1) and chromeos==0 and use_ozone==0', {
+           'dependencies': [
+             '../../build/linux/system.gyp:atk',
+            ],
+         }],
+-        ['OS=="linux" and chromeos==0', {
++        ['(OS=="linux" or os_bsd==1) and chromeos==0', {
+           'dependencies': [
+             '../shell_dialogs/shell_dialogs.gyp:shell_dialogs',
+           ],
+@@ -767,7 +767,7 @@
+         ['use_aura and chromeos == 0', {
+           'sources': [ '<@(views_desktop_aura_sources)' ],
+           'conditions': [
+-            ['OS == "linux"', {
++            ['OS == "linux" or os_bsd == 1', {
+               'sources': [ '<@(views_desktop_aura_linux_sources)' ],
+             }],
+             ['use_x11 == 1', {
diff --git a/www/chromium/files/patch-ui_views_views__delegate.cc b/www/chromium/files/patch-ui_views_views__delegate.cc
new file mode 100644
index 000000000000..f71869f26186
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_views__delegate.cc
@@ -0,0 +1,11 @@
+--- ui/views/views_delegate.cc.orig	2016-03-25 13:05:04 UTC
++++ ui/views/views_delegate.cc
+@@ -70,7 +70,7 @@ HICON ViewsDelegate::GetDefaultWindowIco
+ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
+   return false;
+ }
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_FREEBSD)
+ gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
+   return nullptr;
+ }
diff --git a/www/chromium/files/patch-ui_views_views__delegate.h b/www/chromium/files/patch-ui_views_views__delegate.h
new file mode 100644
index 000000000000..d823c4555267
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_views__delegate.h
@@ -0,0 +1,11 @@
+--- ui/views/views_delegate.h.orig	2016-05-11 19:02:36 UTC
++++ ui/views/views_delegate.h
+@@ -141,7 +141,7 @@ class VIEWS_EXPORT ViewsDelegate {
+   // Returns true if the window passed in is in the Windows 8 metro
+   // environment.
+   virtual bool IsWindowInMetro(gfx::NativeWindow window) const;
+-#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_FREEBSD)
+   virtual gfx::ImageSkia* GetDefaultWindowIcon() const;
+ #endif
+ 
diff --git a/www/chromium/files/patch-ui_views_views__switches.cc b/www/chromium/files/patch-ui_views_views__switches.cc
new file mode 100644
index 000000000000..92e7faf8dbc7
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_views__switches.cc
@@ -0,0 +1,11 @@
+--- ui/views/views_switches.cc.orig	2016-03-25 13:05:04 UTC
++++ ui/views/views_switches.cc
+@@ -18,7 +18,7 @@ const char kDisableViewsRectBasedTargeti
+     "disable-views-rect-based-targeting";
+ 
+ bool IsRectBasedTargetingEnabled() {
+-#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX)
++#if defined(OS_CHROMEOS) || defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
+   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
+       kDisableViewsRectBasedTargeting);
+ #else
diff --git a/www/chromium/files/patch-ui_views_window_custom__frame__view.cc b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
new file mode 100644
index 000000000000..377615f7c78c
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_window_custom__frame__view.cc
@@ -0,0 +1,11 @@
+--- ui/views/window/custom_frame_view.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/window/custom_frame_view.cc
+@@ -288,7 +288,7 @@ int CustomFrameView::NonClientTopBorderH
+ int CustomFrameView::CaptionButtonY() const {
+   // Maximized buttons start at window top so that even if their images aren't
+   // drawn flush with the screen edge, they still obey Fitts' Law.
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
+   return FrameBorderThickness();
+ #else
+   return frame_->IsMaximized() ? FrameBorderThickness() : kFrameShadowThickness;
diff --git a/www/chromium/files/patch-ui_views_window_dialog__delegate.cc b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
new file mode 100644
index 000000000000..e003992d56be
--- /dev/null
+++ b/www/chromium/files/patch-ui_views_window_dialog__delegate.cc
@@ -0,0 +1,11 @@
+--- ui/views/window/dialog_delegate.cc.orig	2016-05-11 19:02:36 UTC
++++ ui/views/window/dialog_delegate.cc
+@@ -53,7 +53,7 @@ Widget* DialogDelegate::CreateDialogWidg
+   params.bounds = bounds;
+   DialogDelegate* dialog = delegate->AsDialogDelegate();
+ 
+-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
+   // The new style doesn't support unparented dialogs on Linux desktop.
+   if (dialog)
+     dialog->supports_new_style_ &= parent != NULL;
diff --git a/www/chromium/files/patch-ui_webui_resources_js_cr.js b/www/chromium/files/patch-ui_webui_resources_js_cr.js
new file mode 100644
index 000000000000..8ca0fc0862a5
--- /dev/null
+++ b/www/chromium/files/patch-ui_webui_resources_js_cr.js
@@ -0,0 +1,14 @@
+--- ui/webui/resources/js/cr.js.orig	2016-05-11 19:02:36 UTC
++++ ui/webui/resources/js/cr.js
+@@ -444,6 +444,11 @@ var cr = function() {
+     get doc() {
+       return document;
+     },
++    
++    /** Whether this is on *BSD. */
++    get isBSD() {
++      return /BSD/.test(navigator.userAgent);
++    },
+ 
+     /** Whether we are using a Mac or not. */
+     get isMac() {
diff --git a/www/chromium/files/patch-ui_webui_resources_js_util.js b/www/chromium/files/patch-ui_webui_resources_js_util.js
new file mode 100644
index 000000000000..742b11644c5c
--- /dev/null
+++ b/www/chromium/files/patch-ui_webui_resources_js_util.js
@@ -0,0 +1,11 @@
+--- ui/webui/resources/js/util.js.orig	2016-05-11 19:02:36 UTC
++++ ui/webui/resources/js/util.js
+@@ -52,7 +52,7 @@ function announceAccessibleMessage(msg) 
+  */
+ function getSupportedScaleFactors() {
+   var supportedScaleFactors = [];
+-  if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux) {
++  if (cr.isMac || cr.isChromeOS || cr.isWindows || cr.isLinux || cr.isBSD) {
+     // All desktop platforms support zooming which also updates the
+     // renderer's device scale factors (a.k.a devicePixelRatio), and
+     // these platforms has high DPI assets for 2.0x. Use 1x and 2x in
diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
deleted file mode 100644
index f1e92ba1a235..000000000000
--- a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
+++ /dev/null
@@ -1,30 +0,0 @@
---- v8/src/base/platform/platform-posix.cc.orig	2015-04-19 17:42:27.000000000 +0200
-+++ v8/src/base/platform/platform-posix.cc	2015-04-19 17:46:17.000000000 +0200
-@@ -55,6 +55,14 @@
- #include <sys/prctl.h>  // NOLINT, for prctl
- #endif
- 
-+#if V8_OS_FREEBSD && !defined(__DragonFly__)
-+#include <sys/thr.h>   // for thr_self
-+#endif
-+
-+#if V8_OS_NETBSD
-+#include <lwp.h>       // for _lwp_self
-+#endif
-+
- #if !defined(V8_OS_NACL) && !defined(_AIX)
- #include <sys/syscall.h>
- #endif
-@@ -271,6 +279,12 @@
-   return static_cast<int>(syscall(__NR_gettid));
- #elif V8_OS_ANDROID
-   return static_cast<int>(gettid());
-+#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__)
-+  return static_cast<int>(lwp_gettid());
-+#elif V8_OS_FREEBSD
-+  return static_cast<int>(pthread_getthreadid_np());
-+#elif V8_OS_NETBSD
-+  return static_cast<int>(_lwp_self());
- #elif V8_OS_AIX
-   return static_cast<int>(thread_self());
- #elif V8_OS_SOLARIS
diff --git a/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
new file mode 100644
index 000000000000..3cbe07a081fe
--- /dev/null
+++ b/www/chromium/files/patch-v8_src_base_platform_platform-posix.cc
@@ -0,0 +1,30 @@
+--- v8/src/base/platform/platform-posix.cc.orig	2016-05-11 19:04:08 UTC
++++ v8/src/base/platform/platform-posix.cc
+@@ -55,6 +55,14 @@
+ #include <sys/prctl.h>  // NOLINT, for prctl
+ #endif
+ 
++#if V8_OS_FREEBSD && !defined(__DragonFly__)
++#include <sys/thr.h>   // for thr_self
++#endif
++
++#if V8_OS_NETBSD
++#include <lwp.h>       // for _lwp_self
++#endif
++
+ #if !defined(V8_OS_NACL) && !defined(_AIX)
+ #include <sys/syscall.h>
+ #endif
+@@ -329,6 +337,12 @@ int OS::GetCurrentThreadId() {
+   return static_cast<int>(syscall(__NR_gettid));
+ #elif V8_OS_ANDROID
+   return static_cast<int>(gettid());
++#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__)
++  return static_cast<int>(lwp_gettid());
++#elif V8_OS_FREEBSD
++  return static_cast<int>(pthread_getthreadid_np());
++#elif V8_OS_NETBSD
++  return static_cast<int>(_lwp_self());
+ #elif V8_OS_AIX
+   return static_cast<int>(thread_self());
+ #elif V8_OS_SOLARIS
diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist
index 8bc20cf1ec1a..0c0d72e0ef1b 100644
--- a/www/chromium/pkg-plist
+++ b/www/chromium/pkg-plist
@@ -61,6 +61,7 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/locales/zh-CN.pak
 %%DATADIR%%/locales/zh-TW.pak
 %%DATADIR%%/mksnapshot
+%%DATADIR%%/pseudo_locales/fake-bidi.pak
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/extension/demo/library.js
 %%DATADIR%%/resources/inspector/Images/applicationCache.png
@@ -96,7 +97,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/localStorage.png
 %%DATADIR%%/resources/inspector/Images/navigationControls.png
 %%DATADIR%%/resources/inspector/Images/navigationControls_2x.png
-%%DATADIR%%/resources/inspector/Images/notifications.svg
 %%DATADIR%%/resources/inspector/Images/paneAddButtons.png
 %%DATADIR%%/resources/inspector/Images/paneFilterButtons.png
 %%DATADIR%%/resources/inspector/Images/paneRefreshButtons.png
@@ -118,8 +118,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/resourcePlainIcon.png
 %%DATADIR%%/resources/inspector/Images/resourcePlainIconSmall.png
 %%DATADIR%%/resources/inspector/Images/resourcesTimeGraphIcon.png
-%%DATADIR%%/resources/inspector/Images/responsiveDesign.png
-%%DATADIR%%/resources/inspector/Images/responsiveDesign_2x.png
 %%DATADIR%%/resources/inspector/Images/searchNext.png
 %%DATADIR%%/resources/inspector/Images/searchPrev.png
 %%DATADIR%%/resources/inspector/Images/securityPropertyInfo.svg
@@ -142,9 +140,9 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/Images/toolbarResizerVertical.png
 %%DATADIR%%/resources/inspector/Images/touchCursor.png
 %%DATADIR%%/resources/inspector/Images/touchCursor_2x.png
-%%DATADIR%%/resources/inspector/Images/updateServiceWorker.svg
 %%DATADIR%%/resources/inspector/InspectorBackendCommands.js
 %%DATADIR%%/resources/inspector/SupportedCSSProperties.js
+%%DATADIR%%/resources/inspector/Tests.js
 %%DATADIR%%/resources/inspector/accessibility_module.js
 %%DATADIR%%/resources/inspector/animation_module.js
 %%DATADIR%%/resources/inspector/audits_module.js
@@ -157,6 +155,8 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/diff_module.js
 %%DATADIR%%/resources/inspector/elements_module.js
 %%DATADIR%%/resources/inspector/emulated_devices_module.js
+%%DATADIR%%/resources/inspector/es_tree_module.js
+%%DATADIR%%/resources/inspector/formatter_worker_module.js
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-default-2x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5-horizontal-keyboard-1x.png
@@ -182,17 +182,14 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-1x.png
 %%DATADIR%%/resources/inspector/emulated_devices/google-nexus-5x-vertical-navigation-2x.png
 %%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js
-%%DATADIR%%/resources/inspector/inspector.css
 %%DATADIR%%/resources/inspector/inspector.html
 %%DATADIR%%/resources/inspector/inspector.js
 %%DATADIR%%/resources/inspector/layers_module.js
 %%DATADIR%%/resources/inspector/network_module.js
 %%DATADIR%%/resources/inspector/profiler_module.js
-%%DATADIR%%/resources/inspector/promises_module.js
 %%DATADIR%%/resources/inspector/resources_module.js
 %%DATADIR%%/resources/inspector/sass_module.js
 %%DATADIR%%/resources/inspector/screencast_module.js
-%%DATADIR%%/resources/inspector/script_formatter_worker_module.js
 %%DATADIR%%/resources/inspector/security_module.js
 %%DATADIR%%/resources/inspector/settings_module.js
 %%DATADIR%%/resources/inspector/snippets_module.js
@@ -200,7 +197,6 @@ share/applications/chromium-browser.desktop
 %%DATADIR%%/resources/inspector/sources_module.js
 %%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js
 %%DATADIR%%/resources/inspector/timeline_module.js
-%%DATADIR%%/resources/inspector/toolbox.css
 %%DATADIR%%/resources/inspector/toolbox.html
 %%DATADIR%%/resources/inspector/toolbox.js
 %%DATADIR%%/resources/inspector/ui_lazy_module.js
-- 
cgit v1.2.3