Fix WebBluetooth generator to distinguish between different methods.

third_party/WebKit/LayoutTests/TestExpectations

 # Intentional failures to test the layout test system.
 Bug(intentional) [ Android Linux Win Mac10.10 Mac10.11 Retina ] harness-tests/crash.html [ Crash ]
 crbug.com/644303 [ Mac10.9 ] harness-tests/crash.html [ Crash Timeout ]
 Bug(intentional) harness-tests/timeout.html [ Timeout ]
 
 # ====== Oilpan-only failures from here ======
 # Most of these actually cause the tests to report success, rather than
 # failure. Expected outputs will be adjusted for the better once Oilpan
 # has been well and truly enabled always.
 
@@ skipping 1341 matching lines @@
 crbug.com/611658 [ Win7 ] fast/forms/text/text-font-height-mismatch.html [ Failure ]
 crbug.com/611658 [ Win ] fast/text/emphasis-combined-text.html [ Failure ]
 crbug.com/611658 [ Win7 ] fast/text/emphasis.html [ Failure ]
 crbug.com/611658 [ Win7 ] fast/writing-mode/english-lr-text.html [ Failure ]
 
 crbug.com/605059 [ Retina ] fast/text/international/rtl-negative-letter-spacing.html [ Failure ]
 
 crbug.com/610464 [ Linux Win7 Debug ] inspector/components/throttler.html [ Failure Pass ]
 
 # TODO(jlebel): Remove when methods are implemented.
-crbug.com/624019 [ Mac ] bluetooth/notifications/add-multiple-event-listeners.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/concurrent-stops.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/event-after-starting.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/gc-with-pending-stop.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/parallel-start-stop.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/start-before-stop-resolves.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/start-stop-start-stop.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/start-succeeds.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/stop-after-start-succeeds.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/stop-twice.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/notifications/stop-without-starting.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/gen-gatt-op-device-disconnects-before.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/device-reconnects-during-success.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/reconnect-during-success.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/gen-gatt-op-device-disconnects-during-success.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/gen-gatt-op-disconnect-called-during-success.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/gen-gatt-op-disconnect-called-before.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/stopNotifications/gen-gatt-op-garbage-collection-ran-during-success.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/getCharacteristics/gen-characteristic-device-disconnects-invalidates-objects.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/getCharacteristics/gen-characteristic-disconnect-invalidates-objects-with-uuid.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/getCharacteristic/gen-characteristic-device-disconnects-invalidates-objects.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/getCharacteristics/gen-characteristic-disconnect-invalidates-objects.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/getCharacteristics/gen-characteristic-device-disconnects-invalidates-objects-with-uuid.html [ Skip ]
-crbug.com/624019 [ Mac ] bluetooth/getCharacteristic/gen-characteristic-disconnect-invalidates-objects.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/add-multiple-event-listeners.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/concurrent-stops.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/event-after-starting.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/gc-with-pending-stop.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/parallel-start-stop.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/start-before-stop-resolves.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/start-stop-start-stop.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/start-succeeds.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/stop-after-start-succeeds.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/stop-twice.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/notifications/stop-without-starting.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/gen-gatt-op-device-disconnects-before.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/device-reconnects-during-success.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/reconnect-during-success.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/gen-gatt-op-device-disconnects-during-success.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/gen-gatt-op-disconnect-called-during-success.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/gen-gatt-op-disconnect-called-before.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/characteristic/stopNotifications/gen-gatt-op-garbage-collection-ran-during-success.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/service/getCharacteristics/gen-device-disconnects-invalidates-objects.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/service/getCharacteristics/gen-disconnect-invalidates-objects-with-uuid.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/service/getCharacteristic/gen-device-disconnects-invalidates-objects.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/service/getCharacteristics/gen-disconnect-invalidates-objects.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/service/getCharacteristics/gen-device-disconnects-invalidates-objects-with-uuid.html [ Skip ]
+crbug.com/624019 [ Mac ] bluetooth/service/getCharacteristic/gen-disconnect-invalidates-objects.html [ Skip ]
+
 
 
 crbug.com/487344 paint/invalidation/video-paint-invalidation.html [ Failure ]
 crbug.com/487344 [ Win ] compositing/video/video-controls-layer-creation.html [ Pass Failure ]
 crbug.com/487344 fast/hidpi/video-controls-in-hidpi.html [ Failure ]
 crbug.com/487344 fast/layers/video-layer.html [ Failure ]
 crbug.com/487344 media/audio-controls-rendering.html [ Failure ]
 crbug.com/487344 media/audio-repaint.html [ Failure ]
 crbug.com/487344 media/controls-after-reload.html [ Failure ]
 crbug.com/487344 media/controls-focus-ring.html [ Failure ]
@@ skipping 315 matching lines @@
 crbug.com/667376 imported/wpt/service-workers/cache-storage/window/cache-match.https.html [ Pass Failure ]
 crbug.com/667376 imported/wpt/service-workers/cache-storage/window/cache-put.https.html [ Pass Failure ]
 
 # Flaky on Linux dbg
 crbug.com/667953 [ Linux Debug ] virtual/android/media/mediadocument/media-document-with-download-button.html [ Pass Failure ]
 
 crbug.com/664782 images/huge-image-viewport-scale.html [ NeedsRebaseline ]
 crbug.com/664782 virtual/gpu-rasterization/images/huge-image-viewport-scale.html [ NeedsRebaseline ]
 
 crbug.com/661497 inspector/console/console-log-side-effects.html [ NeedsRebaseline ]