Move Paint Team TestExpectations lines into appropriate sections

third_party/WebKit/LayoutTests/TestExpectations

 # Intentional failures to test the layout test system.
 Bug(intentional) harness-tests/crash.html [ Crash ]
 Bug(intentional) harness-tests/timeout.html [ Timeout ]
 
 # TODO(qyearsley): Remove these lines and uncomment other test expectation
 # lines related to CSS tests (crbug.com/706118).
 crbug.com/706118 external/wpt/css/CSS2 [ Skip ]
 crbug.com/706118 external/wpt/css/css-align-3 [ Skip ]
 crbug.com/706118 external/wpt/css/css-display-3 [ Skip ]
 crbug.com/706118 external/wpt/css/css-flexbox-1 [ Skip ]
@@ skipping 45 matching lines @@
 crbug.com/600618 virtual/spv2/svg/custom/object-current-scale.html [ Pass ]
 
 # Re-add this once it rebaselines.
 # crbug.com/600618 virtual/spv2/svg/custom/object-sizing-explicit-height.xhtml [ Pass ]
 # SkiaBitLocker should avoid allocating huge offscreen buffer
 crbug.com/605812 [ Mac ] virtual/spv2/fast/overflow/overflow-height-float-not-removed-crash.html [ Skip ]
 crbug.com/605812 [ Mac ] virtual/spv2/fast/overflow/overflow-height-float-not-removed-crash2.html [ Skip ]
 crbug.com/619427 [ Mac Linux ] virtual/spv2/fast/overflow/overflow-height-float-not-removed-crash3.html [ Pass Failure ]
 # --- End SPV2 Tests ---
 
-crbug.com/309675 compositing/gestures/gesture-tapHighlight-simple-longPress.html [ Failure ]
-crbug.com/309675 virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-simple-longPress.html [ Failure ]
-
-crbug.com/504613 crbug.com/524248 paint/images/image-backgrounds-not-antialiased.html [ Skip ]
-crbug.com/504613 crbug.com/524248 virtual/disable-spinvalidation/paint/images/image-backgrounds-not-antialiased.html [ Skip ]
-
-crbug.com/517449 [ Android ] images/optimize-contrast-image.html [ Failure ]
-
-crbug.com/676561 [ Android ] images/paletted-png-with-color-profile.html [ Skip ]
-
-# The failure in the next line is due to virtual/gpu bots using osmesa
-# Under osmesa, skia's filter quality doesn't work correctly. This test is expected to pass
-# when we swith to swiftshader.
-crbug.com/549742 [ Linux Mac Win ] virtual/gpu/fast/canvas/canvas-drawImage-video-imageSmoothingEnabled.html [ Failure ]
-
-crbug.com/602110 hittesting/border-hittest-with-image-fallback.html [ Failure ]
-
-crbug.com/606302 [ Win7 Debug ] transforms/3d/point-mapping/3d-point-mapping-preserve-3d.html [ Pass Failure ]
-crbug.com/606302 [ Win7 Debug ] transforms/3d/point-mapping/3d-point-mapping-deep.html [ Failure ]
-
-# Fails consistently on WebKit Mac10.10, WebKit Mac10.11 (retina) and mac10.10_blink_rel tryserver, but not on other Mac bots.
-crbug.com/614910 [ Mac ] virtual/gpu-rasterization/images/pixel-crack-image-background-webkit-transform-scale.html [ Pass Failure ]
-
 crbug.com/624709 [ Win ] virtual/gpu-rasterization/images/webp-color-profile-lossy.html [ Failure ]
 crbug.com/587737 [ Mac ] virtual/gpu-rasterization/images/color-profile-filter.html [ Timeout Failure ]
 crbug.com/624233 virtual/gpu-rasterization/images/color-profile-background-clip-text.html [ Pass Failure Crash ]
 
 ########## Ref tests can't be rebaselined ##########
+crbug.com/504613 crbug.com/524248 paint/images/image-backgrounds-not-antialiased.html [ Failure ]
+crbug.com/504613 crbug.com/524248 virtual/disable-spinvalidation/paint/images/image-backgrounds-not-antialiased.html [ Failure ]
+
 crbug.com/619103 paint/invalidation/background-resize-width.html [ Failure ]
 crbug.com/619103 virtual/disable-spinvalidation/paint/invalidation/background-resize-width.html [ Failure ]
 
 crbug.com/627844 virtual/gpu/fast/canvas/canvas-createImageBitmap-colorClamping.html [ Failure ]
 
 crbug.com/626748 paint/invalidation/table/cached-change-row-border-color.html [ Failure ]
 crbug.com/626748 paint/invalidation/table/cached-change-tbody-border-color.html [ Failure ]
 crbug.com/626748 virtual/disable-spinvalidation/paint/invalidation/table/cached-change-row-border-color.html [ Failure ]
 crbug.com/626748 virtual/disable-spinvalidation/paint/invalidation/table/cached-change-tbody-border-color.html [ Failure ]
 
@@ skipping 21 matching lines @@
 crbug.com/653722 virtual/disable-spinvalidation/compositing/reflections/nested-reflection-transition.html [ Pass Failure ]
 
 crbug.com/664850 virtual/display_list_2d_canvas/fast/canvas/canvas-createImageBitmap-webgl.html [ Pass Failure ]
 crbug.com/664850 virtual/display_list_2d_canvas/fast/canvas/OffscreenCanvas-2d-drawImage.html [ Pass Failure ]
 crbug.com/664850 virtual/display_list_2d_canvas/fast/canvas/OffscreenCanvas-commit-invalid-call.html [ Pass Failure ]
 
 crbug.com/664852 virtual/gpu/fast/canvas/canvas-createImageBitmap-webgl.html [ Pass Failure ]
 crbug.com/664852 virtual/gpu/fast/canvas/OffscreenCanvas-2d-drawImage.html [ Pass Failure ]
 
 ########## Bugs to fix ##########
+# This is a missing event and increasing the timeout or using run-after-layout-and-paint doesn't
+# seem to fix it.
+crbug.com/309675 compositing/gestures/gesture-tapHighlight-simple-longPress.html [ Failure ]
+crbug.com/309675 virtual/disable-spinvalidation/compositing/gestures/gesture-tapHighlight-simple-longPress.html [ Failure ]
+
+# The failure in the next line is due to virtual/gpu bots using osmesa
+# Under osmesa, skia's filter quality doesn't work correctly. This test is expected to pass
+# when we swith to swiftshader.
+crbug.com/549742 [ Linux Mac Win ] virtual/gpu/fast/canvas/canvas-drawImage-video-imageSmoothingEnabled.html [ Failure ]
+
+crbug.com/602110 hittesting/border-hittest-with-image-fallback.html [ Failure ]
+
+# Fails consistently on WebKit Mac10.10, WebKit Mac10.11 (retina) and mac10.10_blink_rel tryserver, but not on other Mac bots.
+crbug.com/614910 [ Mac ] virtual/gpu-rasterization/images/pixel-crack-image-background-webkit-transform-scale.html [ Pass Failure ]
+
 crbug.com/671048 virtual/color_space/fast/canvas/color-space/display_linear-rgb.html [ Pass Failure Crash ]
 
 # ====== Paint team owned tests to here ======
 
 # ====== LayoutNG-only failures from here ======
 # LayoutNG - is a new layout system for Blink.
 
 #### css2.1/20110323
 #### Passed: 225
 #### Skipped: 184
@@ skipping 2536 matching lines @@
 
 crbug.com/700788 virtual/enable_wasm/http/tests/wasm/wasm_local_iframe_test.html [ Failure ]
 
 # Sheriff failures 2017-04-03
 # Should be [ Crash Pass ], but this has a commented out [ Skip ] expectation
 # for Mac earlier in the file, so just skip it everywhere.
 crbug.com/707689 shapedetection/detection-HTMLCanvasElement.html [ Skip ]
 
 # Tests to be run only under virtual/experimental-canvas-features/
 crbug.com/682753 fast/canvas-experimental [ Skip ]