//tools/binary_size: source_path information, change file format, fixes

tools/binary_size/testdata/test.map

Index: tools/binary_size/testdata/test.map
diff --git a/tools/binary_size/testdata/test.map b/tools/binary_size/testdata/test.map
index 9b499a0a73cc7220bebe7bb2bc3b29da6307729d..cc15b5dba4457660b26dc76fa7509b999d5a2f7f 100644
--- a/tools/binary_size/testdata/test.map
+++ b/tools/binary_size/testdata/test.map
@@ -75,28 +75,30 @@ Memory map
  .text.startup._GLOBAL__sub_I_page_allocator.cc
                 0x0028d900       0x10 obj/base/base/page_allocator.o
  .text.startup._GLOBAL__sub_I_bbr_sender.cc
-                0x0028d910       0x38 obj/net/net/bbr_sender.o
+                0x0028d910       0x38 obj/base/base/page_allocator.o
  ** fill        0x0028d948        0xa
  .text.startup._GLOBAL__sub_I_pacing_sender.cc
-                0x0028d948       0x1c obj/net/net/pacing_sender.o
+                0x0028d948       0x1c obj/base/base/page_allocator.o
  .text._ZL18extFromUUseMappingaji
-                0xffffffffffffffff       0x26 obj/third_party/icu/icuuc/ucnv_ext.o
+                0xffffffffffffffff       0x26 obj/base/base/page_allocator.o
+ .text._ZL18extFromUUseMapping2aji
+                0xffffffffffffffff       0x20 obj/base/base/page_allocator.o
  .text._ZL18ucnv_extMatchFromUPKiiPKtiS2_iPjaa
                 0x0028f000      0x1c0 obj/third_party/icu/icuuc/ucnv_ext.o
  .text.startup._GLOBAL__sub_I_SkDeviceProfile.cpp
-                0x0028f1c8       0x14 obj/skia/skia/SkDeviceProfile.o
+                0x0028f1c8       0x14 obj/third_party/icu/icuuc/ucnv_ext.o
  .text.startup._GLOBAL__sub_I_SkDiscardableMemoryPool.cpp
-                0x0028f1e0       0x14 obj/skia/skia/SkDiscardableMemoryPool.o
+                0x0028f1e0       0x14 obj/third_party/icu/icuuc/ucnv_ext.o
  .text._ZN5blink23ContiguousContainerBase11shrinkToFitEv
-                0x00680000       0x1c obj/third_party/WebKit/Source/platform/platform/ContiguousContainer.o
-                0x00680001                blink::ContiguousContainerBase::shrinkToFit()
+                0x002a0000       0x1c obj/third_party/WebKit.a(PaintChunker.o)
+                0x002a0001                blink::ContiguousContainerBase::shrinkToFit()
  .text._ZN5blink23ContiguousContainerBaseC2EOS0_
-                0xffffffffffffffff       0x18 obj/third_party/WebKit/Source/platform/platform/ContiguousContainer.o
-                0x006818b1                blink::ContiguousContainerBase::ContiguousContainerBase(blink::ContiguousContainerBase&&)
-                0x006818b1                blink::ContiguousContainerBase::ContiguousContainerBase(blink::ContiguousContainerBase&&)
+                0xffffffffffffffff       0x18 obj/third_party/WebKit.a(ContiguousContainer.o)
+                0x002a0021                blink::ContiguousContainerBase::ContiguousContainerBase(blink::ContiguousContainerBase&&)
+                0x002a0021                blink::ContiguousContainerBase::ContiguousContainerBase(blink::ContiguousContainerBase&&)
  .text._ZN5blink12PaintChunker18releasePaintChunksEv
-                0x0069095c       0x5e obj/third_party/WebKit/Source/platform/platform/PaintChunker.o
-                0x0069095d                blink::PaintChunker::releasePaintChunks()
+                0x002a1000       0x5e obj/third_party/WebKit.a(ContiguousContainer.o)
+                0x002a1001                (anonymous namespace)::blink::PaintChunker::releasePaintChunks()
 
 .ARM.exidx      0x024ca628   0x1771c8
  .ARM.exidx.text.startup._GLOBAL__sub_I_page_allocator.cc
@@ -109,28 +111,31 @@ Memory map
 .rodata         0x0266e600   0x5a72e4
  ** merge strings
                 0x0266e600   0x1dfd61
- .rodata        0x0284e364        0x8 obj/chrome/chrome_android_core/chrome_main_delegate.o
- .rodata._ZN6chrome5mojom18FieldTrialRecorder5Name_E
-                0x0284e370       0x28 obj/chrome/common/mojo_bindings/field_trial_recorder.mojom.o
-                0x0284e370                chrome::mojom::FieldTrialRecorder::Name_
+ .rodata        0x0284e364        0x8 obj/base/base/page_allocator.o
+ .rodata.Name
+                0x0284e370       0x28 obj/base/base/page_allocator.o
+                0x0284e370                Name
  .rodata._ZN6chrome5mojom11FilePatcher5Name_E
-                0x0284e398       0x20 obj/chrome/common/mojo_bindings/file_patcher.mojom.o
+                0x0284e398       0x20 obj/third_party/WebKit.a(ContiguousContainer.o)
                 0x0284e398                chrome::mojom::FilePatcher::Name_
  ** merge strings
                 0x0284e518    0xa4f31
  .rodata._ZN12_GLOBAL__N_1L37kAnimationFrameTimeHistogramClassPathE
-                0x028f3450       0x30 obj/base/base/animation_frame_time_histogram.o
+                0x028f3450       0x30 obj/third_party/WebKit.a(PaintChunker.o)
+ .rodata._ZZN5blink20CSSValueKeywordsHash13findValueImplEPKcjE15value_word_list
+                0x028f3480       0x4 obj/third_party/WebKit.a(PaintChunker.o)
+                0x028f3480                blink::(anonymous namespace)::CSSValueKeywordsHash::findValueImpl(char const*, unsigned int)::value_word_list
 
 .data.rel.ro.local
                 0x02c176f0    0xc0e08
  .data.rel.ro.local._ZTV18ChromeMainDelegate
-                0x02c176f0       0x38 obj/chrome/chrome_android_core/chrome_main_delegate.o
+                0x02c176f0       0x38 obj/third_party/icu/icuuc/ucnv_ext.o
                 0x02c176f0                vtable for ChromeMainDelegate
  .data.rel.ro.local._ZTVN6chrome5mojom34FieldTrialRecorderRequestValidatorE
-                0x02c17728       0x18 obj/chrome/common/mojo_bindings/field_trial_recorder.mojom.o
+                0x02c17728       0x18 obj/third_party/icu/icuuc/ucnv_ext.o
                 0x02c17728                vtable for chrome::mojom::FieldTrialRecorderRequestValidator
  .data.rel.ro.local._ZTVN6chrome5mojom23FieldTrialRecorderProxyE
-                0x02c17740       0x18 obj/chrome/common/mojo_bindings/field_trial_recorder.mojom.o
+                0x02c17740       0x18 obj/third_party/WebKit.a(ContiguousContainer.o)
                 0x02c17740                vtable for chrome::mojom::FieldTrialRecorderProxy
  .data.rel.ro.local..Lswitch.table.45
                 0x02cd84e0       0x10 ../../third_party/gvr-android-sdk/libgvr_shim_static_arm.a(libcontroller_api_impl.a_controller_api_impl.o)
@@ -139,13 +144,13 @@ Memory map
 
 .data.rel.ro    0x02cd8500   0x104108
  .data.rel.ro._ZTV25ChromeMainDelegateAndroid
-                0x02cd8500       0x38 obj/chrome/chrome_android_core/chrome_main_delegate_android.o
+                0x02cd8500       0x38 obj/third_party/WebKit.a(PaintChunker.o)
                 0x02cd8500                vtable for ChromeMainDelegateAndroid
  .data.rel.ro._ZTVN4mojo15MessageReceiverE
-                0x02cd8538       0x18 obj/chrome/common/mojo_bindings/module_event_sink_win.mojom.o
+                0x02cd8538       0x18 obj/base/base/page_allocator.o
                 0x02cd8538                vtable for mojo::MessageReceiver
  .data.rel.ro._ZL35kMethodsAnimationFrameTimeHistogram
-                0x02cd8550        0xc obj/base/base/animation_frame_time_histogram.o
+                0x02cd8550        0xc obj/base/base/page_allocator.o
 
 .init_array     0x02ddc608       0x8
  .init_array    0x02ddc608        0x4 obj/base/base/library_prefetcher.o
@@ -166,26 +171,26 @@ Memory map
 
 .data           0x02de7000    0x18d88
  .data._ZN6google8protobuf8internal19pLinuxKernelCmpxchgE
-                0x02de7000        0x4 obj/chrome/chrome_android_core/chrome_main_delegate_android.o
+                0x02de7000        0x4 obj/base/base/page_allocator.o
                 0x02de7000                google::protobuf::internal::pLinuxKernelCmpxchg
  .data._ZN6google8protobuf8internal25pLinuxKernelMemoryBarrierE
-                0x02de7004        0x4 obj/chrome/chrome_android_core/chrome_main_delegate_android.o
+                0x02de7004        0x4 obj/third_party/WebKit.a(ContiguousContainer.o)
                 0x02de7004                google::protobuf::internal::pLinuxKernelMemoryBarrier
  .data.rel._ZN4base7androidL22kBaseRegisteredMethodsE
-                0x02de7008       0x98 obj/base/base/base_jni_registrar.o
+                0x02de7008       0x98 obj/third_party/WebKit.a(ContiguousContainer.o)
  .data._ZN4base7android12_GLOBAL__N_125g_renderer_histogram_codeE
-                0x02de70a0        0x4 obj/base/base/library_loader_hooks.o
+                0x02de70a0        0x4 obj/third_party/WebKit.a(ContiguousContainer.o)
  .data.rel.local._ZN4base7android12_GLOBAL__N_124g_library_version_numberE
-                0x02de70a4        0x4 obj/base/base/library_loader_hooks.o
+                0x02de70a4        0x4 obj/third_party/WebKit.a(ContiguousContainer.o)
 
 .bss            0x02dffda0   0x13d7e8
  .bss.g_chrome_content_browser_client
-                0x02dffda0       0x1c obj/chrome/chrome_android_core/chrome_main_delegate.o
+                0x02dffda0       0x1c obj/third_party/icu/icuuc/ucnv_ext.o
                 0x02dffda0                g_chrome_content_browser_client
  .bss._ZZL13SaveHistogramP7_JNIEnvRKN4base7android12JavaParamRefIP8_jobjectEERKNS3_IP8_jstringEERKNS3_IP11_jlongArrayEEiE24atomic_histogram_pointer
-                0x02dffe80        0x4 obj/base/base/animation_frame_time_histogram.o
+                0x02dffe80        0x4 obj/third_party/icu/icuuc/ucnv_ext.o
  .bss._ZN12_GLOBAL__N_135g_AnimationFrameTimeHistogram_clazzE
-                0x02dffe84        0x4 obj/base/base/animation_frame_time_histogram.o
+                0x02dffe84        0x4 obj/third_party/icu/icuuc/ucnv_ext.o
  ** common      0x02e2fca0   0x10d8e8
 
 .debug_info     0x00000000  0x81aee3a