Add/modify more worker expectations

Adds and modifies a number of expectations related to worker tests now
that tests are properly run in different worker types instead of always
using dedicated workers.

Bug: dawn:2479, dawn:2486
Change-Id: I22ec822ab13f96dfa80a3dfcddea593c7fe01035
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/181942
Auto-Submit: Brian Sheedy <bsheedy@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@google.com>
diff --git a/webgpu-cts/expectations.txt b/webgpu-cts/expectations.txt
index 5f09ce6..d4f37a7 100644
--- a/webgpu-cts/expectations.txt
+++ b/webgpu-cts/expectations.txt
@@ -565,40 +565,43 @@
 crbug.com/dawn/2478 [ android android-pixel-6 ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ Failure ]
 crbug.com/dawn/2478 [ android android-pixel-6 webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mappingPending: [ Failure ]
 crbug.com/dawn/2478 [ android android-pixel-6 webgpu-service-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mappingPending: [ Failure ]
-crbug.com/dawn/2478 [ android android-pixel-6 webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mappingPending: [ Failure ]
 crbug.com/dawn/2479 [ android android-pixel-4 webgpu-dedicated-worker ] webgpu:api,operation,render_pass,storeOp:render_pass_store_op,color_attachment_only:* [ RetryOnFailure ]
 crbug.com/dawn/2479 [ android android-pixel-4 webgpu-service-worker ] webgpu:api,operation,render_pass,storeOp:render_pass_store_op,color_attachment_only:* [ RetryOnFailure ]
-crbug.com/dawn/2479 [ android android-pixel-4 webgpu-shared-worker ] webgpu:api,operation,render_pass,storeOp:render_pass_store_op,color_attachment_only:* [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,operation,onSubmittedWorkDone:many,serial: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,operation,onSubmittedWorkDone:with_work: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,operation,onSubmittedWorkDone:without_work: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,operation,render_pass,storeOp:render_pass_store_op,color_attachment_only:* [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mapped: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappedAtCreation: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,usage: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:unmap,state,destroyed: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mapped: [ RetryOnFailure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mapped: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappedAtCreation: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:mapAsync,usage: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:unmap,state,destroyed: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mapped: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-dedicated-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mappedAtCreation: [ Failure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,operation,onSubmittedWorkDone:many,serial: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,operation,onSubmittedWorkDone:with_work: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,operation,onSubmittedWorkDone:without_work: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,operation,render_pass,storeOp:render_pass_store_op,color_attachment_only:* [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mapped: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappedAtCreation: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,usage: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:unmap,state,destroyed: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mapped: [ RetryOnFailure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:getMappedRange,subrange,mapped:mapMode=1 [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:getMappedRange,subrange,mapped:mapMode=2 [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mapped: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappedAtCreation: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:mapAsync,usage: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:unmap,state,destroyed: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mapped: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-service-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mappedAtCreation: [ Failure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,operation,onSubmittedWorkDone:many,serial: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,operation,onSubmittedWorkDone:with_work: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,operation,onSubmittedWorkDone:without_work: [ RetryOnFailure ]
 crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,operation,render_pass,storeOp:render_pass_store_op,color_attachment_only:* [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mapped: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappedAtCreation: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,usage: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:unmap,state,destroyed: [ RetryOnFailure ]
-crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mapped: [ RetryOnFailure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mapped: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappedAtCreation: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:mapAsync,usage: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:unmap,state,destroyed: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mapped: [ Failure ]
+crbug.com/dawn/2479 [ linux nvidia webgpu-shared-worker ] webgpu:api,validation,buffer,mapping:unmap,state,mappedAtCreation: [ Failure ]
 crbug.com/dawn/2478 [ linux webgpu-no-worker ] webgpu:api,validation,buffer,mapping:getMappedRange,state,mappingPending: [ Failure ]
 crbug.com/dawn/2478 [ linux webgpu-no-worker ] webgpu:api,validation,buffer,mapping:mapAsync,earlyRejection: [ Failure ]
 crbug.com/dawn/2478 [ linux webgpu-no-worker ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ Failure ]
@@ -608,6 +611,7 @@
 crbug.com/dawn/2478 [ win10 ] webgpu:api,validation,buffer,mapping:getMappedRange,state,mappingPending: [ Failure ]
 crbug.com/dawn/2478 [ win10 ] webgpu:api,validation,buffer,mapping:mapAsync,earlyRejection: [ Failure ]
 crbug.com/dawn/2478 [ win10 ] webgpu:api,validation,buffer,mapping:mapAsync,state,mappingPending: [ Failure ]
+crbug.com/dawn/2486 [ android webgpu-shared-worker ] * [ Skip ]
 
 ################################################################################
 # video tests fail on SwiftShader. Due to multiplanar formatted textures not