base/base.gyp                                      |    7 +
 base/base.gypi                                     |    7 +
 base/debug/stack_trace_posix.cc                    |    5 
 base/files/file_path_watcher_kqueue.h              |    4 
 base/posix/unix_domain_socket_linux.cc             |   19 ++
 base/posix/unix_domain_socket_linux_unittest.cc    |    5 
 base/process/internal_linux.h                      |    2 
 base/process/launch.cc                             |    4 
 base/process/launch.h                              |    4 
 base/process/memory.cc                             |   32 +++
 base/process/memory_unittest.cc                    |    6 -
 base/process/process_info_linux.cc                 |   19 ++
 base/process/process_iterator_freebsd.cc           |   16 +-
 base/process/process_metrics.h                     |   11 +
 base/process/process_metrics_freebsd.cc            |   22 ++
 base/process/process_posix.cc                      |   11 +
 base/security_unittest.cc                          |    2 
 base/strings/safe_sprintf.cc                       |   15 +
 base/sys_info_freebsd.cc                           |   35 +++
 base/sys_info_posix.cc                             |    2 
 base/test/expectations/expectation.cc              |    3 
 base/test/launcher/test_launcher.cc                |    4 
 base/threading/platform_thread_linux.cc            |    4 
 build/common.gypi                                  |   19 +-
 build/filename_rules.gypi                          |    2 
 build/linux/system.gyp                             |    7 +
 build/linux/unbundle/libwebp.gyp                   |    8 -
 cc/layers/layer_impl.cc                            |   10 +
 cc/layers/scrollbar_layer_impl_base.cc             |    4 
 chrome/app/chrome_main_delegate.cc                 |   14 +
 chrome/app/chrome_main_delegate.h                  |    2 
 chrome/app/chromium_strings.grd                    |    2 
 chrome/app/resources/locale_settings.grd           |    2 
 chrome/browser/about_flags.cc                      |    2 
 chrome/browser/chrome_browser_main.cc              |    2 
 chrome/browser/chrome_browser_main_posix.cc        |    6 +
 chrome/browser/chrome_content_browser_client.cc    |   10 -
 chrome/browser/chrome_content_browser_client.h     |    2 
 chrome/browser/defaults.cc                         |    2 
 chrome/browser/diagnostics/diagnostics_writer.cc   |    2 
 chrome/browser/diagnostics/diagnostics_writer.h    |    2 
 chrome/browser/download/download_commands.h        |    3 
 chrome/browser/download/download_prefs.cc          |   14 +
 chrome/browser/download/download_prefs.h           |    4 
 .../download/download_shelf_context_menu.cc        |    2 
 .../image_writer_private_api.cc                    |    2 
 .../api/music_manager_private/device_id_linux.cc   |   34 +++
 chrome/browser/extensions/window_open_apitest.cc   |    2 
 chrome/browser/gpu/gl_string_manager.cc            |    2 
 chrome/browser/gpu/gpu_feature_checker.cc          |    2 
 chrome/browser/media/webrtc_log_uploader.cc        |    2 
 .../fileapi/mtp_device_map_service.cc              |    2 
 .../media_galleries/media_file_system_registry.cc  |    5 
 .../browser/media_galleries/media_folder_finder.cc |    4 
 chrome/browser/memory_details.cc                   |    6 -
 .../chrome_browser_main_extra_parts_metrics.cc     |    4 
 .../metrics/drive_metrics_provider_linux.cc        |    6 +
 chrome/browser/net/connection_tester.cc            |    2 
 chrome/browser/net/cookie_store_util.cc            |    2 
 .../message_center_notification_manager.cc         |    2 
 chrome/browser/plugins/plugins_resource_service.cc |    2 
 chrome/browser/policy/policy_prefs_browsertest.cc  |    2 
 chrome/browser/process_singleton_posix.cc          |    8 -
 chrome/browser/renderer_preferences_util.cc        |    8 -
 .../incident_reporting/incident_handler_util.cc    |    5 
 chrome/browser/ssl/ssl_blocking_page.cc            |    2 
 .../sync/profile_sync_components_factory_impl.cc   |    2 
 chrome/browser/tracing/crash_service_uploader.cc   |    2 
 .../aura/chrome_browser_main_extra_parts_aura.cc   |    6 -
 .../ui/aura/chrome_browser_main_extra_parts_aura.h |    2 
 chrome/browser/ui/browser.cc                       |    4 
 chrome/browser/ui/browser_command_controller.cc    |    8 -
 chrome/browser/ui/browser_view_prefs.cc            |    4 
 .../ui/exclusive_access/exclusive_access_bubble.cc |    2 
 chrome/browser/ui/panels/panel_manager.cc          |    2 
 .../browser/ui/startup/startup_browser_creator.cc  |    2 
 chrome/browser/ui/toolbar/wrench_menu_model.cc     |    2 
 .../browser/ui/views/tabs/tab_drag_controller.cc   |    6 -
 .../apps/chrome_native_app_window_views_aura.cc    |    4 
 chrome/browser/ui/views/chrome_views_delegate.cc   |    6 -
 chrome/browser/ui/views/chrome_views_delegate.h    |    4 
 chrome/browser/ui/views/first_run_dialog.cc        |    6 -
 chrome/browser/ui/views/frame/browser_frame.cc     |    4 
 .../ui/views/frame/opaque_browser_frame_view.cc    |    8 -
 .../frame/opaque_browser_frame_view_layout.cc      |    2 
 .../opaque_browser_frame_view_platform_specific.cc |    2 
 .../ui/views/frame/system_menu_model_builder.cc    |    4 
 .../message_center/message_center_frame_view.cc    |    2 
 .../message_center_widget_delegate.cc              |    2 
 .../views/message_center/web_notification_tray.cc  |    4 
 chrome/browser/ui/views/panels/panel_frame_view.cc |    2 
 chrome/browser/ui/views/tabs/tab_strip.cc          |    2 
 chrome/browser/ui/webui/about_ui.cc                |   10 +
 .../ui/webui/chrome_web_ui_controller_factory.cc   |    2 
 .../ui/webui/options/browser_options_handler.cc    |   10 -
 .../ui/webui/options/browser_options_handler.h     |    2 
 chrome/browser/web_applications/web_app.cc         |    2 
 chrome/browser/web_applications/web_app.h          |    2 
 chrome/chrome_browser.gypi                         |   13 +
 chrome/chrome_browser_extensions.gypi              |    5 
 chrome/chrome_browser_ui.gypi                      |   10 -
 chrome/chrome_exe.gypi                             |    2 
 chrome/common/chrome_paths.cc                      |   11 +
 chrome/common/chrome_paths.h                       |    2 
 chrome/common/chrome_switches.cc                   |    4 
 chrome/common/chrome_switches.h                    |    2 
 chrome/common/extensions/command.cc                |    2 
 chrome/common/pref_names.cc                        |    4 
 chrome/common/pref_names.h                         |    4 
 .../renderer/pepper/pepper_flash_font_file_host.cc |   10 -
 .../renderer/pepper/pepper_flash_font_file_host.h  |    4 
 chrome/test/base/in_process_browser_test.cc        |    4 
 chrome/test/base/testing_browser_process.h         |    4 
 chrome/test/chromedriver/chrome/chrome_finder.cc   |    4 
 components/policy/resources/policy_templates.json  |    6 -
 components/policy/tools/generate_policy_source.py  |    2 
 .../printing/renderer/print_web_view_helper.h      |    2 
 components/storage_monitor.gypi                    |   20 ++
 components/storage_monitor/storage_monitor.cc      |    2 
 .../storage_monitor/storage_monitor_freebsd.cc     |  102 ++++++++++
 .../storage_monitor/storage_monitor_freebsd.h      |   47 +++++
 components/update_client/update_query_params.cc    |    2 
 content/app/content_main_runner.cc                 |   10 +
 content/browser/browser_main_loop.cc               |    8 -
 content/browser/child_process_launcher.cc          |   18 +-
 content/browser/download/base_file.cc              |    3 
 content/browser/download/base_file_linux.cc        |    2 
 .../geolocation/location_arbitrator_impl.cc        |    2 
 .../geolocation/wifi_data_provider_freebsd.cc      |  201 ++++++++++++++++++++
 .../geolocation/wifi_data_provider_freebsd.h       |   30 +++
 .../browser/gpu/gpu_data_manager_impl_private.cc   |    6 +
 .../browser/indexed_db/indexed_db_backing_store.cc |    2 
 .../renderer_host/render_widget_host_view_aura.cc  |    8 -
 content/browser/time_zone_monitor_linux.cc         |    6 +
 .../sandbox_linux/sandbox_debug_handling_linux.cc  |    6 +
 content/common/set_process_title_linux.cc          |    3 
 content/common/set_process_title_linux.h           |    4 
 content/content_browser.gypi                       |   18 +-
 content/content_common.gypi                        |   15 +
 content/content_tests.gypi                         |    9 +
 content/gpu/gpu_child_thread.cc                    |    2 
 content/gpu/gpu_main.cc                            |   10 -
 content/public/common/content_switches.cc          |    2 
 content/public/common/content_switches.h           |    2 
 content/public/test/browser_test_base.cc           |    4 
 .../renderer/accessibility/blink_ax_tree_source.cc |   14 +
 content/renderer/devtools/v8_sampling_profiler.cc  |    4 
 content/renderer/media/webrtc_audio_capturer.cc    |    4 
 content/renderer/pepper/usb_key_code_conversion.cc |    2 
 "content/renderer/render_thread_impl.cc\t"         |    2 
 content/renderer/renderer_blink_platform_impl.cc   |   12 +
 content/renderer/renderer_blink_platform_impl.h    |    2 
 .../renderer_main_platform_delegate_linux.cc       |    3 
 .../webscrollbarbehavior_impl_gtkoraura.cc         |    4 
 content/shell/browser/shell_browser_context.cc     |    4 
 content/shell/browser/shell_browser_main_parts.cc  |    4 
 crypto/nss_util.cc                                 |    8 -
 device/hid/hid.gyp                                 |   12 +
 device/serial/serial.gyp                           |    6 +
 device/serial/serial_io_handler_posix.cc           |    4 
 device/serial/serial_service_impl.cc               |    5 
 device/usb/usb.gyp                                 |    5 
 device/usb/usb_context.cc                          |    7 +
 device/usb/usb_context_unittest.cc                 |    4 
 device/usb/usb_device_handle_impl.cc               |   18 ++
 device/usb/usb_device_handle_impl.h                |    5 
 device/usb/usb_device_impl.cc                      |    4 
 device/usb/usb_error.cc                            |    4 
 device/usb/usb_service_impl.cc                     |    6 +
 device/usb/usb_service_impl.h                      |   10 +
 extensions/browser/api/serial/serial_api.cc        |    2 
 .../service/async_pixel_transfer_manager_egl.cc    |    6 -
 .../async_pixel_transfer_manager_share_group.cc    |    2 
 gpu/config/gpu_control_list.cc                     |    4 
 gpu/config/gpu_control_list_unittest.cc            |    3 
 gpu/config/gpu_info_collector.cc                   |    2 
 gpu/config/gpu_test_config.cc                      |    7 +
 gpu/config/gpu_util.cc                             |    2 
 gpu/gpu_config.gypi                                |    8 +
 media/audio/audio_input_volume_unittest.cc         |    2 
 media/base/audio_splicer.cc                        |    4 
 media/filters/decrypting_audio_decoder.cc          |    2 
 media/media.gyp                                    |   10 +
 .../capture/fake_video_capture_device_factory.cc   |    2 
 .../capture/file_video_capture_device_factory.cc   |    2 
 .../capture/linux/video_capture_device_linux.cc    |    4 
 .../capture/linux/video_capture_device_linux.h     |    2 
 media/video/capture/video_capture_device.cc        |    8 +
 media/video/capture/video_capture_device.h         |    8 -
 .../video/capture/video_capture_device_factory.cc  |    5 
 native_client/build/common.gypi                    |    2 
 native_client/src/shared/platform/platform.gyp     |    2 
 net/base/address_tracker_linux.cc                  |   19 ++
 net/base/address_tracker_linux.h                   |    6 +
 net/base/address_tracker_linux_unittest.cc         |    4 
 net/base/dns_reloader.cc                           |    3 
 net/base/mime_util_unittest.cc                     |    2 
 net/base/net_util.h                                |    3 
 net/base/net_util_linux.cc                         |   21 ++
 net/base/net_util_posix.cc                         |    2 
 net/base/network_change_notifier.cc                |    1 
 net/dns/address_sorter_posix.cc                    |    1 
 net/dns/dns_config_service_posix_unittest.cc       |    2 
 net/dns/dns_session.cc                             |    2 
 net/http/http_auth_gssapi_posix.cc                 |    4 
 net/net.gyp                                        |    7 +
 net/net.gypi                                       |    6 -
 net/net_common.gypi                                |    3 
 net/proxy/proxy_config_service_linux.cc            |   57 +++++-
 net/proxy/proxy_service.cc                         |    4 
 net/quic/congestion_control/rtt_stats.cc           |    2 
 net/socket/socks5_client_socket.cc                 |    4 
 net/socket/tcp_listen_socket_unittest.h            |    3 
 net/udp/udp_socket_unittest.cc                     |    2 
 ppapi/proxy/file_io_resource.cc                    |   18 +-
 .../private/net_address_private_impl.cc            |    6 -
 printing/printing.gyp                              |    2 
 remoting/remoting_host.gypi                        |   10 -
 skia/ext/SkMemory_new_handler.cpp                  |    4 
 skia/skia_chrome.gypi                              |    5 
 skia/skia_common.gypi                              |    2 
 sync/util/get_session_name.cc                      |    4 
 sync/util/get_session_name_linux.cc                |    5 
 testing/gtest/include/gtest/internal/gtest-port.h  |    6 -
 testing/gtest/src/gtest.cc                         |    6 -
 .../Source/bindings/core/v8/V8ScriptRunner.cpp     |    2 
 third_party/WebKit/Source/core/core.gyp            |   10 -
 .../WebKit/Source/platform/blink_platform.gyp      |   11 +
 .../Source/platform/heap/StackFrameDepth.cpp       |    2 
 .../WebKit/Source/platform/heap/Visitor.cpp        |    2 
 third_party/WebKit/Source/web/web.gyp              |    2 
 third_party/WebKit/Source/wtf/ByteSwap.h           |    6 +
 third_party/WebKit/Source/wtf/wtf.gyp              |    2 
 third_party/ffmpeg/libavutil/mem.c                 |    2 
 third_party/khronos/khronos.gyp                    |    1 
 third_party/libXNVCtrl/libXNVCtrl.gyp              |    3 
 third_party/libexif/libexif.gyp                    |    4 
 third_party/libjingle/libjingle.gyp                |    2 
 third_party/libjpeg_turbo/libjpeg.gyp              |    2 
 third_party/libphonenumber/libphonenumber.gyp      |    1 
 third_party/ots/include/opentype-sanitiser.h       |    1 
 third_party/pdfium/build/standalone.gypi           |    6 -
 third_party/pdfium/core/include/fxcrt/fx_system.h  |    2 
 .../fpdfsdk/src/javascript/PublicMethods.cpp       |    4 
 third_party/pdfium/fpdfsdk/src/jsapi/fxjs_v8.cpp   |    7 +
 third_party/pdfium/pdfium.gyp                      |    2 
 third_party/pdfium/third_party/base/logging.h      |    2 
 third_party/sfntly/sfntly.gyp                      |    2 
 third_party/skia/src/core/SkVarAlloc.cpp           |    5 
 third_party/sqlite/sqlite.gyp                      |    2 
 third_party/webrtc/base/cpumonitor.cc              |    8 -
 third_party/webrtc/base/httpcommon.cc              |    2 
 third_party/webrtc/base/ipaddress.h                |    3 
 third_party/webrtc/base/linux.cc                   |    4 
 third_party/webrtc/base/linux.h                    |    4 
 third_party/webrtc/base/network.cc                 |    6 -
 third_party/webrtc/base/network.h                  |    4 
 third_party/webrtc/base/physicalsocketserver.cc    |    8 -
 third_party/webrtc/base/stringutils.h              |    6 -
 third_party/webrtc/base/systeminfo.cc              |   21 ++
 third_party/webrtc/base/thread_checker_impl.cc     |   16 +-
 third_party/webrtc/build/common.gypi               |    7 +
 .../webrtc/modules/audio_device/audio_device.gypi  |    4 
 .../modules/desktop_capture/desktop_capture.gypi   |    5 
 .../rtp_rtcp/source/forward_error_correction.cc    |    1 
 .../modules/video_coding/main/source/receiver.cc   |    4 
 .../system_wrappers/source/atomic32_posix.cc       |    4 
 .../webrtc/system_wrappers/source/cpu_info.cc      |   13 +
 .../webrtc/system_wrappers/source/thread_posix.cc  |    6 -
 .../webrtc/voice_engine/voice_engine_defines.h     |    2 
 tools/gyp/pylib/gyp/generator/make.py              |   20 +-
 .../test/additional-targets/src/dir1/actions.gyp   |    2 
 tools/gyp/test/library/src/library.gyp             |    2 
 ui/accessibility/accessibility.gyp                 |    4 
 ui/accessibility/platform/ax_platform_node.cc      |    2 
 ui/app_list/app_list_constants.cc                  |    2 
 ui/app_list/app_list_constants.h                   |    4 
 ui/app_list/app_list_menu.cc                       |    2 
 ui/app_list/views/app_list_view.cc                 |    4 
 ui/base/ime/input_method_factory.cc                |    4 
 ui/base/ime/input_method_initializer.cc            |    8 -
 ui/base/resource/resource_bundle.cc                |    2 
 ui/base/ui_base.gyp                                |    2 
 ui/base/webui/web_ui_util.cc                       |    2 
 ui/events/event_switches.cc                        |    2 
 ui/events/event_switches.h                         |    2 
 ui/events/keycodes/dom4/keycode_converter.cc       |    2 
 ui/gfx/canvas_skia.cc                              |    2 
 ui/gfx/render_text.cc                              |   21 +-
 ui/gl/gl.gyp                                       |    4 
 ui/gl/gl_surface_glx.cc                            |    2 
 ui/gl/sync_control_vsync_provider.cc               |    6 -
 ui/message_center/message_center_style.h           |    2 
 .../views/message_center_button_bar.cc             |   10 -
 .../views/message_center_button_bar.h              |    2 
 ui/message_center/views/message_center_view.cc     |    4 
 ui/message_center/views/notification_view.cc       |    2 
 ui/resources/ui_resources.grd                      |    2 
 ui/shell_dialogs/select_file_dialog.cc             |    4 
 .../accessibility/native_view_accessibility.cc     |    3 
 ui/views/bubble/bubble_delegate.cc                 |    2 
 .../label_button.cc    Wed May 20 08:34:57 2015    |    8 -
 .../controls/menu/menu_scroll_view_container.cc    |    2 
 ui/views/controls/scrollbar/base_scroll_bar.cc     |    2 
 ui/views/controls/textfield/textfield.cc           |   18 +-
 ui/views/examples/widget_example.cc                |    2 
 ui/views/views.gyp                                 |    4 
 ui/views/views_delegate.cc                         |    2 
 ui/views/views_delegate.h                          |    2 
 ui/views/views_switches.cc                         |    2 
 ui/views/window/custom_frame_view.cc               |    2 
 ui/views/window/dialog_delegate.cc                 |    2 
 v8/src/base/platform/platform-posix.cc             |   21 ++
 313 files changed, 1626 insertions(+), 479 deletions(-)