Update from https://crrev.com/328418
This includes the switch to libc++ on android.
Fixes outside of the rolled code:
*) ::TestSuite -> base::TestSuite
*) base::ScopedPtrHashMap's second parameter Value->scoped_ptr<Value>
*) re2 std::tr1 changes from upstream libc++ changes
*) tracked_objects:: api changes in mojo/common/task_tracker*
Review URL: https://codereview.chromium.org/1128733002
diff --git a/base/trace_event/trace_event.gypi b/base/trace_event/trace_event.gypi
index 9bbd172..9a072e4 100644
--- a/base/trace_event/trace_event.gypi
+++ b/base/trace_event/trace_event.gypi
@@ -6,13 +6,10 @@
'trace_event_sources' : [
'trace_event/java_heap_dump_provider_android.cc',
'trace_event/java_heap_dump_provider_android.h',
- 'trace_event/memory_allocator_attributes_type_info.cc',
- 'trace_event/memory_allocator_attributes_type_info.h',
'trace_event/memory_allocator_dump.cc',
'trace_event/memory_allocator_dump.h',
'trace_event/memory_dump_manager.cc',
'trace_event/memory_dump_manager.h',
- 'trace_event/memory_dump_provider.cc',
'trace_event/memory_dump_provider.h',
'trace_event/memory_dump_request_args.h',
'trace_event/memory_dump_session_state.cc',
@@ -56,7 +53,7 @@
}],
],
'trace_event_test_sources' : [
- 'trace_event/memory_allocator_attributes_type_info_unittest.cc',
+ 'trace_event/java_heap_dump_provider_android_unittest.cc',
'trace_event/memory_allocator_dump_unittest.cc',
'trace_event/memory_dump_manager_unittest.cc',
'trace_event/process_memory_maps_dump_provider_unittest.cc',
