//tools/binary_size: Change merge symbols to have their size as padding

tools/binary_size/testdata/Map2Size.golden

Index: tools/binary_size/testdata/Map2Size.golden
diff --git a/tools/binary_size/testdata/Map2Size.golden b/tools/binary_size/testdata/Map2Size.golden
index ee8e9d73c266cc9a201197b5bb89f5522f650d8b..736535926d597fff3d94173f5800ca271db3d64b 100644
--- a/tools/binary_size/testdata/Map2Size.golden
+++ b/tools/binary_size/testdata/Map2Size.golden
@@ -1,47 +1,47 @@
-Section r has 44.6% of 2641188 bytes accounted for from 7 symbols. 3286464 bytes are unaccounted for. Padding accounts for 14 bytes
-+ Without 2 merge sections and 0 anonymous entries (accounting for 2641042 bytes):
+Section r has 44.6% of 2641540 bytes accounted for from 7 symbols. 3286112 bytes are unaccounted for. Padding accounts for 366 bytes
++ Without 2 merge sections and 0 anonymous entries (accounting for 2641394 bytes):
 + Section r has 0.0% of 146 bytes accounted for from 5 symbols. 5927506 bytes are unaccounted for. Padding accounts for 14 bytes
 Section b has 0.0% of 0 bytes accounted for from 6 symbols. 1300456 bytes are unaccounted for. Padding accounts for 196 bytes
 Section d has 0.0% of 388 bytes accounted for from 13 symbols. 1956628 bytes are unaccounted for. Padding accounts for 0 bytes
-Section t has 0.0% of 10578 bytes accounted for from 13 symbols. 35890134 bytes are unaccounted for. Padding accounts for 12 bytes
+Section t has 0.0% of 10578 bytes accounted for from 13 symbols. 35890134 bytes are unaccounted for. Padding accounts for 9774 bytes
 + Without 2 merge sections and 0 anonymous entries (accounting for 9758 bytes):
 + Section t has 0.0% of 820 bytes accounted for from 11 symbols. 35899892 bytes are unaccounted for. Padding accounts for 16 bytes
-.bss@0(size=262144,padding=0,name=ff_cos_131072,path=third_party/fft_float.cc,anon=0)
-.bss@0(size=131072,padding=0,name=ff_cos_131072_fixed,path=third_party/fft_fixed.cc,anon=0)
-.bss@0(size=131072,padding=0,name=ff_cos_65536,path=third_party/fft_float.cc,anon=0)
-.bss@2dffda0(size=28,padding=0,name=g_chrome_content_browser_client,path=third_party/icu/ucnv_ext.c,anon=0)
-.bss@2dffe80(size=4,padding=196,name=SaveHistogram::atomic_histogram_pointer,path=third_party/icu/ucnv_ext.c,anon=0)
-.bss@2dffe84(size=4,padding=0,name=g_AnimationFrameTimeHistogram_clazz,path=third_party/icu/ucnv_ext.c,anon=1)
-.data@2de7000(size=4,padding=0,name=google::protobuf::internal::pLinuxKernelCmpxchg,path=base/page_allocator.cc,anon=0)
-.data@2de7004(size=4,padding=0,name=google::protobuf::internal::pLinuxKernelMemoryBarrier,path=third_party/container.c,anon=0)
-.data@2de7008(size=152,padding=0,name=rel._ZN4base7androidL22kBaseRegisteredMethodsE,path=third_party/container.c,anon=0)
-.data@2de70a0(size=4,padding=0,name=base::android::g_renderer_histogram_code,path=third_party/container.c,anon=1)
-.data@2de70a4(size=4,padding=0,name=rel.local._ZN4base7android12_GLOBAL__N_124g_library_version_numberE,path=third_party/container.c,anon=0)
-.data.rel.ro@2cd8500(size=56,padding=0,name=ChromeMainDelegateAndroid [vtable],path=third_party/paint.cc,anon=0)
-.data.rel.ro@2cd8538(size=24,padding=0,name=mojo::MessageReceiver [vtable],path=base/page_allocator.cc,anon=0)
-.data.rel.ro@2cd8550(size=12,padding=0,name=kMethodsAnimationFrameTimeHistogram,path=base/page_allocator.cc,anon=0)
-.data.rel.ro.local@2c176f0(size=56,padding=0,name=ChromeMainDelegate [vtable],path=third_party/icu/ucnv_ext.c,anon=0)
-.data.rel.ro.local@2c17728(size=24,padding=0,name=chrome::mojom::FieldTrialRecorderRequestValidator [vtable],path=third_party/icu/ucnv_ext.c,anon=0)
-.data.rel.ro.local@2c17740(size=24,padding=0,name=chrome::mojom::FieldTrialRecorderProxy [vtable],path=third_party/container.c,anon=0)
-.data.rel.ro.local@2cd84e0(size=16,padding=0,name=.Lswitch.table.45,path=third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libcontroller_api_impl.a_controller_api_impl.o,anon=0)
-.data.rel.ro.local@2cd84f0(size=8,padding=0,name=kSystemClassPrefixes,path=third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libport_android_jni.a_jni_utils.o,anon=1)
-.rodata@266e600(size=1965409,padding=0,name=** merge strings,path=,anon=0)
-.rodata@284e364(size=8,padding=3,name=,path=base/page_allocator.cc,anon=0)
-.rodata@284e370(size=40,padding=4,name=Name,path=base/page_allocator.cc,anon=0)
-.rodata@284e398(size=32,padding=0,name=chrome::mojom::FilePatcher::Name_,path=third_party/container.c,anon=0)
-.rodata@284e518(size=675633,padding=0,name=** merge strings,path=,anon=0)
-.rodata@28f3450(size=48,padding=7,name=kAnimationFrameTimeHistogramClassPath,path=third_party/paint.cc,anon=1)
-.rodata@28f3480(size=4,padding=0,name=blink::CSSValueKeywordsHash::findValueImpl::value_word_list,path=third_party/paint.cc,anon=1)
-.text@28d900(size=16,padding=0,name=startup._GLOBAL__sub_I_page_allocator.cc,path=base/page_allocator.cc,anon=0)
-.text@28d910(size=56,padding=0,name=startup._GLOBAL__sub_I_bbr_sender.cc,path=base/page_allocator.cc,anon=0)
-.text@28d948(size=28,padding=0,name=startup._GLOBAL__sub_I_pacing_sender.cc,path=base/page_allocator.cc,anon=0)
-.text@28d964(size=38,padding=0,name=extFromUUseMapping,path=base/page_allocator.cc,anon=0)
-.text@28d98a(size=32,padding=0,name=extFromUUseMapping,path=base/page_allocator.cc,anon=0)
-.text@28d9aa(size=5718,padding=0,name=** symbol gap 0,path=third_party/icu/ucnv_ext.c,anon=0)
-.text@28f000(size=448,padding=0,name=ucnv_extMatchFromU,path=third_party/icu/ucnv_ext.c,anon=0)
-.text@28f1c8(size=20,padding=8,name=startup._GLOBAL__sub_I_SkDeviceProfile.cpp,path=third_party/icu/ucnv_ext.c,anon=0)
-.text@28f1e0(size=20,padding=4,name=startup._GLOBAL__sub_I_SkDiscardableMemoryPool.cpp,path=third_party/icu/ucnv_ext.c,anon=0)
-.text@2a0000(size=28,padding=0,name=blink::ContiguousContainerBase::shrinkToFit,path=third_party/paint.cc,anon=0)
-.text@2a0020(size=24,padding=4,name=blink::ContiguousContainerBase::ContiguousContainerBase,path=third_party/container.c,anon=0)
-.text@2a0034(size=4044,padding=-4,name=** symbol gap 1,path=third_party/container.c,anon=0)
-.text@2a1000(size=94,padding=0,name=blink::PaintChunker::releasePaintChunks,path=third_party/container.c,anon=1)
+.bss@0(size_without_padding=262144,padding=0,name=ff_cos_131072,path=third_party/fft_float.cc,anon=0)
+.bss@0(size_without_padding=131072,padding=0,name=ff_cos_131072_fixed,path=third_party/fft_fixed.cc,anon=0)
+.bss@0(size_without_padding=131072,padding=0,name=ff_cos_65536,path=third_party/fft_float.cc,anon=0)
+.bss@2dffda0(size_without_padding=28,padding=0,name=g_chrome_content_browser_client,path=third_party/icu/ucnv_ext.c,anon=0)
+.bss@2dffe80(size_without_padding=4,padding=196,name=SaveHistogram::atomic_histogram_pointer,path=third_party/icu/ucnv_ext.c,anon=0)
+.bss@2dffe84(size_without_padding=4,padding=0,name=g_AnimationFrameTimeHistogram_clazz,path=third_party/icu/ucnv_ext.c,anon=1)
+.data@2de7000(size_without_padding=4,padding=0,name=google::protobuf::internal::pLinuxKernelCmpxchg,path=base/page_allocator.cc,anon=0)
+.data@2de7004(size_without_padding=4,padding=0,name=google::protobuf::internal::pLinuxKernelMemoryBarrier,path=third_party/container.c,anon=0)
+.data@2de7008(size_without_padding=152,padding=0,name=rel._ZN4base7androidL22kBaseRegisteredMethodsE,path=third_party/container.c,anon=0)
+.data@2de70a0(size_without_padding=4,padding=0,name=base::android::g_renderer_histogram_code,path=third_party/container.c,anon=1)
+.data@2de70a4(size_without_padding=4,padding=0,name=rel.local._ZN4base7android12_GLOBAL__N_124g_library_version_numberE,path=third_party/container.c,anon=0)
+.data.rel.ro@2cd8500(size_without_padding=56,padding=0,name=ChromeMainDelegateAndroid [vtable],path=third_party/paint.cc,anon=0)
+.data.rel.ro@2cd8538(size_without_padding=24,padding=0,name=mojo::MessageReceiver [vtable],path=base/page_allocator.cc,anon=0)
+.data.rel.ro@2cd8550(size_without_padding=12,padding=0,name=kMethodsAnimationFrameTimeHistogram,path=base/page_allocator.cc,anon=0)
+.data.rel.ro.local@2c176f0(size_without_padding=56,padding=0,name=ChromeMainDelegate [vtable],path=third_party/icu/ucnv_ext.c,anon=0)
+.data.rel.ro.local@2c17728(size_without_padding=24,padding=0,name=chrome::mojom::FieldTrialRecorderRequestValidator [vtable],path=third_party/icu/ucnv_ext.c,anon=0)
+.data.rel.ro.local@2c17740(size_without_padding=24,padding=0,name=chrome::mojom::FieldTrialRecorderProxy [vtable],path=third_party/container.c,anon=0)
+.data.rel.ro.local@2cd84e0(size_without_padding=16,padding=0,name=.Lswitch.table.45,path=third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libcontroller_api_impl.a_controller_api_impl.o,anon=0)
+.data.rel.ro.local@2cd84f0(size_without_padding=8,padding=0,name=kSystemClassPrefixes,path=third_party/gvr-android-sdk/libgvr_shim_static_arm.a/libport_android_jni.a_jni_utils.o,anon=1)
+.rodata@266e600(size_without_padding=1965409,padding=0,name=** merge strings,path=,anon=0)
+.rodata@284e364(size_without_padding=8,padding=3,name=,path=base/page_allocator.cc,anon=0)
+.rodata@284e370(size_without_padding=40,padding=4,name=Name,path=base/page_allocator.cc,anon=0)
+.rodata@284e398(size_without_padding=32,padding=0,name=chrome::mojom::FilePatcher::Name_,path=third_party/container.c,anon=0)
+.rodata@284e518(size_without_padding=675633,padding=352,name=** merge strings,path=,anon=0)
+.rodata@28f3450(size_without_padding=48,padding=7,name=kAnimationFrameTimeHistogramClassPath,path=third_party/paint.cc,anon=1)
+.rodata@28f3480(size_without_padding=4,padding=0,name=blink::CSSValueKeywordsHash::findValueImpl::value_word_list,path=third_party/paint.cc,anon=1)
+.text@28d900(size_without_padding=16,padding=0,name=startup._GLOBAL__sub_I_page_allocator.cc,path=base/page_allocator.cc,anon=0)
+.text@28d910(size_without_padding=56,padding=0,name=startup._GLOBAL__sub_I_bbr_sender.cc,path=base/page_allocator.cc,anon=0)
+.text@28d948(size_without_padding=28,padding=0,name=startup._GLOBAL__sub_I_pacing_sender.cc,path=base/page_allocator.cc,anon=0)
+.text@28d964(size_without_padding=38,padding=0,name=extFromUUseMapping,path=base/page_allocator.cc,anon=0)
+.text@28d98a(size_without_padding=32,padding=0,name=extFromUUseMapping,path=base/page_allocator.cc,anon=0)
+.text@28f000(size_without_padding=0,padding=5718,name=** symbol gap 0,path=third_party/icu/ucnv_ext.c,anon=0)
+.text@28f000(size_without_padding=448,padding=0,name=ucnv_extMatchFromU,path=third_party/icu/ucnv_ext.c,anon=0)
+.text@28f1c8(size_without_padding=20,padding=8,name=startup._GLOBAL__sub_I_SkDeviceProfile.cpp,path=third_party/icu/ucnv_ext.c,anon=0)
+.text@28f1e0(size_without_padding=20,padding=4,name=startup._GLOBAL__sub_I_SkDiscardableMemoryPool.cpp,path=third_party/icu/ucnv_ext.c,anon=0)
+.text@2a0000(size_without_padding=28,padding=0,name=blink::ContiguousContainerBase::shrinkToFit,path=third_party/paint.cc,anon=0)
+.text@2a0020(size_without_padding=24,padding=4,name=blink::ContiguousContainerBase::ContiguousContainerBase,path=third_party/container.c,anon=0)
+.text@2a1000(size_without_padding=0,padding=4040,name=** symbol gap 1,path=third_party/container.c,anon=0)
+.text@2a1000(size_without_padding=94,padding=0,name=blink::PaintChunker::releasePaintChunks,path=third_party/container.c,anon=1)