libchrome: Uprev libchrome to r576279.

BUG=chromium:909719
TEST=None

Change-Id: Ia0de6a705cd666985675c2885ab7d2ef938c94a6
diff --git a/BUILD.gn b/BUILD.gn
index 4477a86..763121e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -22,7 +22,7 @@
     "USE_NSS_CERTS",
     "USE_SYSTEM_LIBEVENT",
     "NO_TCMALLOC",
-    "MOJO_EDK_LEGACY_PROTOCOL",
+    "MOJO_CORE_LEGACY_PROTOCOL",
   ]
   if (use.asan) {
     defines += [ "LEAK_SANITIZER" ]
@@ -62,12 +62,13 @@
       "base/allocator/allocator_shim.cc",
       "base/allocator/allocator_shim_default_dispatch_to_glibc.cc",
       "base/at_exit.cc",
+      "base/barrier_closure.cc",
       "base/base64.cc",
       "base/base64url.cc",
       "base/base_paths.cc",
       "base/base_paths_posix.cc",
       "base/base_switches.cc",
-      "base/bind_helpers.cc",
+      "base/big_endian.cc",
       "base/build_time.cc",
       "base/callback_helpers.cc",
       "base/callback_internal.cc",
@@ -75,6 +76,7 @@
       "base/cpu.cc",
       "base/debug/activity_tracker.cc",
       "base/debug/alias.cc",
+      "base/debug/crash_logging.cc",
       "base/debug/debugger.cc",
       "base/debug/debugger_posix.cc",
       "base/debug/dump_without_crashing.cc",
@@ -110,33 +112,44 @@
       "base/json/json_value_converter.cc",
       "base/json/json_writer.cc",
       "base/json/string_escape.cc",
-      "base/lazy_instance.cc",
+      "base/lazy_instance_helpers.cc",
       "base/location.cc",
       "base/logging.cc",
       "base/md5.cc",
       "base/memory/aligned_memory.cc",
+      "base/memory/platform_shared_memory_region.cc",
+      "base/memory/platform_shared_memory_region_posix.cc",
+      "base/memory/read_only_shared_memory_region.cc",
       "base/memory/ref_counted.cc",
       "base/memory/ref_counted_memory.cc",
+      "base/memory/shared_memory_handle.cc",
+      "base/memory/shared_memory_handle_posix.cc",
       "base/memory/shared_memory_helper.cc",
       "base/memory/shared_memory_posix.cc",
-      "base/memory/shared_memory_tracker.cc",
-      "base/memory/singleton.cc",
+      "base/memory/shared_memory_mapping.cc",
+      "base/memory/unsafe_shared_memory_region.cc",
       "base/memory/weak_ptr.cc",
+      "base/memory/writable_shared_memory_region.cc",
       "base/message_loop/incoming_task_queue.cc",
       "base/message_loop/message_loop.cc",
+      "base/message_loop/message_loop_current.cc",
       "base/message_loop/message_loop_task_runner.cc",
       "base/message_loop/message_pump.cc",
       "base/message_loop/message_pump_default.cc",
       "base/message_loop/message_pump_glib.cc",
       "base/message_loop/message_pump_libevent.cc",
+      "base/message_loop/watchable_io_message_pump_posix.cc",
       "base/metrics/bucket_ranges.cc",
+      "base/metrics/dummy_histogram.cc",
       "base/metrics/field_trial.cc",
       "base/metrics/field_trial_param_associator.cc",
-      "base/metrics/metrics_hashes.cc",
-      "base/metrics/histogram_base.cc",
+      "base/metrics/field_trial_params.cc",
       "base/metrics/histogram.cc",
+      "base/metrics/histogram_base.cc",
+      "base/metrics/histogram_functions.cc",
       "base/metrics/histogram_samples.cc",
       "base/metrics/histogram_snapshot_manager.cc",
+      "base/metrics/metrics_hashes.cc",
       "base/metrics/persistent_histogram_allocator.cc",
       "base/metrics/persistent_memory_allocator.cc",
       "base/metrics/persistent_sample_map.cc",
@@ -145,12 +158,13 @@
       "base/metrics/sparse_histogram.cc",
       "base/metrics/statistics_recorder.cc",
       "base/path_service.cc",
+      "base/observer_list_threadsafe.cc",
       "base/pending_task.cc",
       "base/pickle.cc",
       "base/posix/file_descriptor_shuffle.cc",
       "base/posix/global_descriptors.cc",
       "base/posix/safe_strerror.cc",
-      "base/posix/unix_domain_socket_linux.cc",
+      "base/posix/unix_domain_socket.cc",
       "base/process/internal_linux.cc",
       "base/process/kill.cc",
       "base/process/kill_posix.cc",
@@ -168,9 +182,6 @@
       "base/process/process_metrics_linux.cc",
       "base/process/process_metrics_posix.cc",
       "base/process/process_posix.cc",
-      "base/profiler/scoped_profile.cc",
-      "base/profiler/scoped_tracker.cc",
-      "base/profiler/tracked_time.cc",
       "base/rand_util.cc",
       "base/rand_util_posix.cc",
       "base/run_loop.cc",
@@ -178,48 +189,64 @@
       "base/sequenced_task_runner.cc",
       "base/sequence_token.cc",
       "base/sha1.cc",
+      "base/strings/nullable_string16.cc",
       "base/strings/pattern.cc",
       "base/strings/safe_sprintf.cc",
       "base/strings/string16.cc",
       "base/strings/string_number_conversions.cc",
       "base/strings/string_piece.cc",
-      "base/strings/stringprintf.cc",
       "base/strings/string_split.cc",
       "base/strings/string_util.cc",
       "base/strings/string_util_constants.cc",
+      "base/strings/stringprintf.cc",
       "base/strings/sys_string_conversions_posix.cc",
-      "base/strings/utf_string_conversions.cc",
       "base/strings/utf_string_conversion_utils.cc",
+      "base/strings/utf_string_conversions.cc",
+      "base/sync_socket_posix.cc",
       "base/synchronization/atomic_flag.cc",
       "base/synchronization/condition_variable_posix.cc",
       "base/synchronization/lock.cc",
       "base/synchronization/lock_impl_posix.cc",
-      "base/synchronization/read_write_lock_posix.cc",
       "base/synchronization/waitable_event_posix.cc",
       "base/synchronization/waitable_event_watcher_posix.cc",
-      "base/sync_socket_posix.cc",
       "base/sys_info.cc",
       "base/sys_info_chromeos.cc",
       "base/sys_info_linux.cc",
       "base/sys_info_posix.cc",
       "base/task_runner.cc",
       "base/task/cancelable_task_tracker.cc",
+      "base/task_scheduler/delayed_task_manager.cc",
+      "base/task_scheduler/environment_config.cc",
+      "base/task_scheduler/post_task.cc",
+      "base/task_scheduler/priority_queue.cc",
       "base/task_scheduler/scheduler_lock_impl.cc",
+      "base/task_scheduler/scheduler_single_thread_task_runner_manager.cc",
+      "base/task_scheduler/scheduler_worker.cc",
+      "base/task_scheduler/scheduler_worker_pool.cc",
+      "base/task_scheduler/scheduler_worker_pool_impl.cc",
+      "base/task_scheduler/scheduler_worker_pool_params.cc",
+      "base/task_scheduler/scheduler_worker_stack.cc",
       "base/task_scheduler/scoped_set_task_priority_for_current_thread.cc",
       "base/task_scheduler/sequence.cc",
       "base/task_scheduler/sequence_sort_key.cc",
+      "base/task_scheduler/service_thread.cc",
       "base/task_scheduler/task.cc",
+      "base/task_scheduler/task_scheduler.cc",
+      "base/task_scheduler/task_scheduler_impl.cc",
       "base/task_scheduler/task_traits.cc",
+      "base/task_scheduler/task_tracker.cc",
+      "base/task_scheduler/task_tracker_posix.cc",
       "base/third_party/dynamic_annotations/dynamic_annotations.c",
       "base/third_party/icu/icu_utf.cc",
       "base/third_party/nspr/prtime.cc",
-      "base/threading/non_thread_safe_impl.cc",
       "base/threading/platform_thread_internal_posix.cc",
       "base/threading/platform_thread_linux.cc",
       "base/threading/platform_thread_posix.cc",
       "base/threading/post_task_and_reply_impl.cc",
+      "base/threading/scoped_blocking_call.cc",
+      "base/threading/sequence_local_storage_map.cc",
+      "base/threading/sequence_local_storage_slot.cc",
       "base/threading/sequenced_task_runner_handle.cc",
-      "base/threading/sequenced_worker_pool.cc",
       "base/threading/simple_thread.cc",
       "base/threading/thread.cc",
       "base/threading/thread_checker_impl.cc",
@@ -229,8 +256,6 @@
       "base/threading/thread_local_storage_posix.cc",
       "base/threading/thread_restrictions.cc",
       "base/threading/thread_task_runner_handle.cc",
-      "base/threading/worker_pool.cc",
-      "base/threading/worker_pool_posix.cc",
       "base/timer/elapsed_timer.cc",
       "base/timer/timer.cc",
       "base/time/clock.cc",
@@ -238,42 +263,12 @@
       "base/time/default_tick_clock.cc",
       "base/time/tick_clock.cc",
       "base/time/time.cc",
-      "base/time/time_posix.cc",
-      "base/trace_event/category_registry.cc",
-      "base/trace_event/event_name_filter.cc",
-      "base/trace_event/malloc_dump_provider.cc",
-      "base/trace_event/heap_profiler_allocation_context.cc",
-      "base/trace_event/heap_profiler_allocation_context_tracker.cc",
-      "base/trace_event/heap_profiler_allocation_register.cc",
-      "base/trace_event/heap_profiler_allocation_register_posix.cc",
-      "base/trace_event/heap_profiler_event_filter.cc",
-      "base/trace_event/heap_profiler_heap_dump_writer.cc",
-      "base/trace_event/heap_profiler_stack_frame_deduplicator.cc",
-      "base/trace_event/heap_profiler_type_name_deduplicator.cc",
-      "base/trace_event/memory_allocator_dump.cc",
-      "base/trace_event/memory_allocator_dump_guid.cc",
-      "base/trace_event/memory_dump_manager.cc",
-      "base/trace_event/memory_dump_provider_info.cc",
-      "base/trace_event/memory_dump_request_args.cc",
-      "base/trace_event/memory_dump_scheduler.cc",
-      "base/trace_event/memory_dump_session_state.cc",
-      "base/trace_event/memory_infra_background_whitelist.cc",
-      "base/trace_event/process_memory_dump.cc",
-      "base/trace_event/process_memory_maps.cc",
-      "base/trace_event/process_memory_totals.cc",
-      "base/trace_event/trace_buffer.cc",
-      "base/trace_event/trace_config.cc",
-      "base/trace_event/trace_config_category_filter.cc",
-      "base/trace_event/trace_event_argument.cc",
-      "base/trace_event/trace_event_filter.cc",
-      "base/trace_event/trace_event_impl.cc",
-      "base/trace_event/trace_event_memory_overhead.cc",
-      "base/trace_event/trace_event_synthetic_delay.cc",
-      "base/trace_event/trace_log.cc",
-      "base/trace_event/trace_log_constants.cc",
-      "base/tracked_objects.cc",
-      "base/tracking_info.cc",
+      "base/time/time_conversion_posix.cc",
+      "base/time/time_exploded_posix.cc",
+      "base/time/time_now_posix.cc",
+      "base/time/time_override.cc",
       "base/unguessable_token.cc",
+      "base/value_iterators.cc",
       "base/values.cc",
       "base/version.cc",
       "base/vlog.cc",
@@ -285,16 +280,24 @@
     output_name = name + "-${libbase_ver}"
     deps = [ ":base-core" ]
     libs = [ "dl" ]
-    sources = [ "base/native_library_posix.cc" ]
+    sources = [
+      "base/native_library_posix.cc",
+      "base/native_library.cc",
+      "base/scoped_native_library.cc",
+    ]
   },
 
   {
     name = "base-policy"
     output_name = name + "-${libbase_ver}"
     deps = [ ":base-core" ]
+    libs = [ "re2" ]
     sources = [
+      "components/json_schema/json_schema_constants.cc",
+      "components/json_schema/json_schema_validator.cc",
       "components/policy/core/common/policy_load_status.cc",
       "components/policy/core/common/registry_dict.cc",
+      "components/policy/core/common/schema.cc",
     ]
   },
 
@@ -309,6 +312,7 @@
       "base/test/test_file_util_linux.cc",
       "base/test/test_mock_time_task_runner.cc",
       "base/test/test_pending_task.cc",
+      "base/test/test_simple_task_runner.cc",
       "base/test/test_switches.cc",
       "base/test/test_timeouts.cc",
     ]
@@ -565,24 +569,43 @@
     mojom_bindings_generator = "mojo/public/tools/bindings/mojom_bindings_generator.py"
     sources = [
       "ipc/ipc.mojom",
-      "mojo/common/file.mojom",
-      "mojo/common/file_path.mojom",
-      "mojo/common/string16.mojom",
-      "mojo/common/text_direction.mojom",
-      "mojo/common/time.mojom",
-      "mojo/common/unguessable_token.mojom",
-      "mojo/common/values.mojom",
-      "mojo/common/version.mojom",
-      "mojo/public/interfaces/bindings/pipe_control_messages.mojom",
-      "mojo/public/interfaces/bindings/interface_control_messages.mojom",
+      "mojo/public/mojom/base/big_buffer.mojom",
+      "mojo/public/mojom/base/big_string.mojom",
+      "mojo/public/mojom/base/file.mojom",
+      "mojo/public/mojom/base/file_error.mojom",
+      "mojo/public/mojom/base/file_info.mojom",
+      "mojo/public/mojom/base/file_path.mojom",
+      "mojo/public/mojom/base/process_id.mojom",
+      "mojo/public/mojom/base/read_only_buffer.mojom",
+      "mojo/public/mojom/base/ref_counted_memory.mojom",
+      "mojo/public/mojom/base/shared_memory.mojom",
+      "mojo/public/mojom/base/string16.mojom",
+      "mojo/public/mojom/base/text_direction.mojom",
+      "mojo/public/mojom/base/thread_priority.mojom",
+      "mojo/public/mojom/base/time.mojom",
+      "mojo/public/mojom/base/unguessable_token.mojom",
+      "mojo/public/mojom/base/values.mojom",
+      "ui/gfx/geometry/mojo/geometry.mojom",
+      "ui/gfx/range/mojo/range.mojom",
     ]
   }
 
+  generate_mojom_bindings_gen("mojom_bindings_native_gen") {
+    mojom_bindings_generator = "mojo/public/tools/bindings/mojom_bindings_generator.py"
+    sources = [
+      "mojo/public/interfaces/bindings/interface_control_messages.mojom",
+      "mojo/public/interfaces/bindings/native_struct.mojom",
+      "mojo/public/interfaces/bindings/pipe_control_messages.mojom",
+    ]
+    disallow_native_types = true
+    disallow_interfaces = true
+  }
+
   # Probably we should consider build libmojo as a part of libchrome.
   # crbug.com/924035.
   static_library("mojo") {
     output_name = "mojo-${libbase_ver}"
-    deps = [ ":base-core", ":base-crypto", ":mojom_bindings_gen" ]
+    deps = [ ":base-core", ":base-crypto", ":mojom_bindings_gen", ":mojom_bindings_native_gen" ]
     # TODO(hidehiko): Consolidate with build_config.h.
     configs -= [
       "//common-mk:use_thin_archive",
@@ -603,94 +626,120 @@
       "ipc/ipc_mojo_message_helper.cc",
       "ipc/ipc_mojo_param_traits.cc",
       "ipc/ipc_platform_file_attachment_posix.cc",
-      "mojo/common/common_custom_types_struct_traits.cc",
-      "mojo/common/data_pipe_drainer.cc",
-      "mojo/common/data_pipe_utils.cc",
-      "mojo/common/values_struct_traits.cc",
-      "mojo/edk/embedder/connection_params.cc",
-      "mojo/edk/embedder/embedder.cc",
-      "mojo/edk/embedder/entrypoints.cc",
-      "mojo/edk/embedder/named_platform_handle_utils_posix.cc",
-      "mojo/edk/embedder/pending_process_connection.cc",
-      "mojo/edk/embedder/platform_channel_pair.cc",
-      "mojo/edk/embedder/platform_channel_pair_posix.cc",
-      "mojo/edk/embedder/platform_channel_utils_posix.cc",
-      "mojo/edk/embedder/platform_handle.cc",
-      "mojo/edk/embedder/platform_handle_utils_posix.cc",
-      "mojo/edk/embedder/platform_shared_buffer.cc",
-      "mojo/edk/embedder/scoped_ipc_support.cc",
-      "mojo/edk/embedder/test_embedder.cc",
-      "mojo/edk/system/broker_host.cc",
-      "mojo/edk/system/broker_posix.cc",
-      "mojo/edk/system/channel.cc",
-      "mojo/edk/system/channel_posix.cc",
-      "mojo/edk/system/configuration.cc",
-      "mojo/edk/system/core.cc",
-      "mojo/edk/system/data_pipe_consumer_dispatcher.cc",
-      "mojo/edk/system/data_pipe_control_message.cc",
-      "mojo/edk/system/data_pipe_producer_dispatcher.cc",
-      "mojo/edk/system/dispatcher.cc",
-      "mojo/edk/system/handle_table.cc",
-      "mojo/edk/system/mapping_table.cc",
-      "mojo/edk/system/message_for_transit.cc",
-      "mojo/edk/system/message_pipe_dispatcher.cc",
-      "mojo/edk/system/node_channel.cc",
-      "mojo/edk/system/node_controller.cc",
-      "mojo/edk/system/platform_handle_dispatcher.cc",
-      "mojo/edk/system/ports/event.cc",
-      "mojo/edk/system/ports/message.cc",
-      "mojo/edk/system/ports/message_queue.cc",
-      "mojo/edk/system/ports/name.cc",
-      "mojo/edk/system/ports/node.cc",
-      "mojo/edk/system/ports/port.cc",
-      "mojo/edk/system/ports/port_ref.cc",
-      "mojo/edk/system/ports_message.cc",
-      "mojo/edk/system/request_context.cc",
-      "mojo/edk/system/shared_buffer_dispatcher.cc",
-      "mojo/edk/system/watch.cc",
-      "mojo/edk/system/watcher_dispatcher.cc",
-      "mojo/edk/system/watcher_set.cc",
-      "mojo/public/c/system/set_thunks_for_app.cc",
+      "mojo/core/invitation_dispatcher.cc",
+      "mojo/core/connection_params.cc",
+      "mojo/core/channel_posix.cc",
+      "mojo/core/platform_handle_dispatcher.cc",
+      "mojo/core/mojo_core.cc",
+      "mojo/core/channel.cc",
+      "mojo/core/entrypoints.cc",
+      "mojo/core/broker_posix.cc",
+      "mojo/core/data_pipe_producer_dispatcher.cc",
+      "mojo/core/broker_host.cc",
+      "mojo/core/watcher_dispatcher.cc",
+      "mojo/core/request_context.cc",
+      "mojo/core/configuration.cc",
+      "mojo/core/node_channel.cc",
+      "mojo/core/shared_buffer_dispatcher.cc",
+      "mojo/core/watch.cc",
+      "mojo/core/embedder/scoped_ipc_support.cc",
+      "mojo/core/embedder/embedder.cc",
+      "mojo/core/message_pipe_dispatcher.cc",
+      "mojo/core/handle_table.cc",
+      "mojo/core/core.cc",
+      "mojo/core/ports/event.cc",
+      "mojo/core/ports/name.cc",
+      "mojo/core/ports/port.cc",
+      "mojo/core/ports/message_queue.cc",
+      "mojo/core/ports/port_locker.cc",
+      "mojo/core/ports/node.cc",
+      "mojo/core/ports/user_message.cc",
+      "mojo/core/ports/port_ref.cc",
+      "mojo/core/data_pipe_consumer_dispatcher.cc",
+      "mojo/core/scoped_process_handle.cc",
+      "mojo/core/node_controller.cc",
+      "mojo/core/watcher_set.cc",
+      "mojo/core/dispatcher.cc",
+      "mojo/core/platform_handle_in_transit.cc",
+      "mojo/core/platform_handle_utils.cc",
+      "mojo/core/platform_shared_memory_mapping.cc",
+      "mojo/core/user_message_impl.cc",
+      "mojo/core/data_pipe_control_message.cc",
       "mojo/public/c/system/thunks.cc",
+      "mojo/public/cpp/base/big_string_mojom_traits.cc",
+      "mojo/public/cpp/base/shared_memory_mojom_traits.cc",
+      "mojo/public/cpp/base/unguessable_token_mojom_traits.cc",
+      "mojo/public/cpp/base/ref_counted_memory_mojom_traits.cc",
+      "mojo/public/cpp/base/big_buffer.cc",
+      "mojo/public/cpp/base/read_only_buffer_mojom_traits.cc",
+      "mojo/public/cpp/base/string16_mojom_traits.cc",
+      "mojo/public/cpp/base/big_buffer_mojom_traits.cc",
+      "mojo/public/cpp/base/file_info_mojom_traits.cc",
+      "mojo/public/cpp/base/time_mojom_traits.cc",
+      "mojo/public/cpp/base/thread_priority_mojom_traits.cc",
+      "mojo/public/cpp/base/text_direction_mojom_traits.cc",
+      "mojo/public/cpp/base/values_mojom_traits.cc",
+      "mojo/public/cpp/base/file_path_mojom_traits.cc",
+      "mojo/public/cpp/base/process_id_mojom_traits.cc",
+      "mojo/public/cpp/base/file_mojom_traits.cc",
+      "mojo/public/cpp/bindings/lib/serialization_context.cc",
+      "mojo/public/cpp/bindings/lib/associated_interface_ptr_state.cc",
       "mojo/public/cpp/bindings/lib/array_internal.cc",
-      "mojo/public/cpp/bindings/lib/associated_binding.cc",
+      "mojo/public/cpp/bindings/lib/interface_ptr_state.cc",
+      "mojo/public/cpp/bindings/lib/buffer.cc",
+      "mojo/public/cpp/bindings/lib/sync_call_restrictions.cc",
+      "mojo/public/cpp/bindings/lib/multiplex_router.cc",
+      "mojo/public/cpp/bindings/lib/sync_handle_watcher.cc",
+      "mojo/public/cpp/bindings/lib/validation_errors.cc",
+      "mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc",
+      "mojo/public/cpp/bindings/lib/message_dumper.cc",
+      "mojo/public/cpp/bindings/lib/sync_event_watcher.cc",
+      "mojo/public/cpp/bindings/lib/task_runner_helper.cc",
+      "mojo/public/cpp/bindings/lib/sequence_local_sync_event_watcher.cc",
+      "mojo/public/cpp/bindings/lib/validation_context.cc",
       "mojo/public/cpp/bindings/lib/associated_group.cc",
+      "mojo/public/cpp/bindings/lib/native_struct_serialization.cc",
+      "mojo/public/cpp/bindings/lib/validation_util.cc",
+      "mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc",
+      "mojo/public/cpp/bindings/lib/filter_chain.cc",
+      "mojo/public/cpp/bindings/lib/message.cc",
+      "mojo/public/cpp/bindings/lib/unserialized_message_context.cc",
+      "mojo/public/cpp/bindings/lib/pipe_control_message_proxy.cc",
+      "mojo/public/cpp/bindings/lib/control_message_proxy.cc",
+      "mojo/public/cpp/bindings/lib/control_message_handler.cc",
+      "mojo/public/cpp/bindings/lib/connector.cc",
+      "mojo/public/cpp/bindings/lib/interface_endpoint_client.cc",
+      "mojo/public/cpp/bindings/lib/sync_handle_registry.cc",
+      "mojo/public/cpp/bindings/lib/associated_binding.cc",
+      "mojo/public/cpp/bindings/lib/message_header_validator.cc",
       "mojo/public/cpp/bindings/lib/associated_group_controller.cc",
       "mojo/public/cpp/bindings/lib/associated_interface_ptr.cc",
-      "mojo/public/cpp/bindings/lib/binding_state.cc",
-      "mojo/public/cpp/bindings/lib/connector.cc",
-      "mojo/public/cpp/bindings/lib/control_message_handler.cc",
-      "mojo/public/cpp/bindings/lib/control_message_proxy.cc",
-      "mojo/public/cpp/bindings/lib/filter_chain.cc",
       "mojo/public/cpp/bindings/lib/fixed_buffer.cc",
-      "mojo/public/cpp/bindings/lib/interface_endpoint_client.cc",
-      "mojo/public/cpp/bindings/lib/message.cc",
-      "mojo/public/cpp/bindings/lib/message_buffer.cc",
-      "mojo/public/cpp/bindings/lib/message_builder.cc",
-      "mojo/public/cpp/bindings/lib/message_header_validator.cc",
-      "mojo/public/cpp/bindings/lib/multiplex_router.cc",
-      "mojo/public/cpp/bindings/lib/native_struct.cc",
-      "mojo/public/cpp/bindings/lib/native_struct_data.cc",
-      "mojo/public/cpp/bindings/lib/native_struct_serialization.cc",
-      "mojo/public/cpp/bindings/lib/pipe_control_message_handler.cc",
-      "mojo/public/cpp/bindings/lib/pipe_control_message_proxy.cc",
-      "mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.cc",
-      "mojo/public/cpp/bindings/lib/serialization_context.cc",
-      "mojo/public/cpp/bindings/lib/string_traits_string16.cc",
-      "mojo/public/cpp/bindings/lib/sync_call_restrictions.cc",
-      "mojo/public/cpp/bindings/lib/sync_event_watcher.cc",
-      "mojo/public/cpp/bindings/lib/sync_handle_registry.cc",
-      "mojo/public/cpp/bindings/lib/sync_handle_watcher.cc",
-      "mojo/public/cpp/bindings/lib/validation_context.cc",
-      "mojo/public/cpp/bindings/lib/validation_errors.cc",
-      "mojo/public/cpp/bindings/lib/validation_util.cc",
+      "mojo/public/cpp/bindings/lib/message_internal.cc",
+      "mojo/public/cpp/bindings/lib/binding_state.cc",
+      "mojo/public/cpp/platform/platform_channel_endpoint.cc",
+      "mojo/public/cpp/platform/platform_handle.cc",
+      "mojo/public/cpp/platform/named_platform_channel.cc",
+      "mojo/public/cpp/platform/platform_channel.cc",
+      "mojo/public/cpp/platform/platform_channel_server_endpoint.cc",
+      "mojo/public/cpp/platform/socket_utils_posix.cc",
+      "mojo/public/cpp/platform/named_platform_channel_posix.cc",
       "mojo/public/cpp/system/buffer.cc",
       "mojo/public/cpp/system/platform_handle.cc",
-      "mojo/public/cpp/system/simple_watcher.cc",
       "mojo/public/cpp/system/wait.cc",
       "mojo/public/cpp/system/wait_set.cc",
-      "mojo/public/cpp/system/watcher.cc",
-    ] + get_target_outputs(":mojom_bindings_gen")
+      "mojo/public/cpp/system/data_pipe_utils.cc",
+      "mojo/public/cpp/system/scope_to_message_pipe.cc",
+      "mojo/public/cpp/system/handle_signal_tracker.cc",
+      "mojo/public/cpp/system/trap.cc",
+      "mojo/public/cpp/system/isolated_connection.cc",
+      "mojo/public/cpp/system/string_data_pipe_producer.cc",
+      "mojo/public/cpp/system/data_pipe_drainer.cc",
+      "mojo/public/cpp/system/invitation.cc",
+      "mojo/public/cpp/system/simple_watcher.cc",
+      "mojo/public/cpp/system/file_data_pipe_producer.cc",
+      "mojo/public/cpp/system/message_pipe.cc",
+    ] + get_target_outputs(":mojom_bindings_gen") + get_target_outputs(":mojom_bindings_native_gen")
   }
 
   generate_pkg_config("libmojo") {