https://bugs.webkit.org/show_bug.cgi?id=109146

Reviewed by Pavel Feldman.

Source/WebCore:

Merged some of memory instrumentation categories.

* dom/WebCoreMemoryInstrumentation.cpp:
(WebCore):
* inspector/front-end/NativeMemorySnapshotView.js:
(WebInspector.MemoryBlockViewProperties._initialize):
* platform/PlatformMemoryInstrumentation.cpp:
(WebCore):

LayoutTests:

Updated tests to use new memory categories.

* inspector-protocol/nmi-webaudio-expected.txt:
* inspector-protocol/nmi-webaudio-leak-test-expected.txt:
* inspector-protocol/nmi-webaudio-leak-test.html:
* inspector-protocol/nmi-webaudio.html:
* inspector/profiler/memory-instrumentation-cached-images-expected.txt:
* inspector/profiler/memory-instrumentation-cached-images.html:
* inspector/profiler/memory-instrumentation-canvas-expected.txt:
* inspector/profiler/memory-instrumentation-canvas.html:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@142239 268f45cc-cd09-0410-ab3c-d52691b4dbfc