Issue #2867881 by catch, Wim Leers, smustgrave, dww: Remove @todo and...

Issue #2867881 by catch, Wim Leers, smustgrave, dww: Remove @todo and workaround in Cookie ResourceTestTrait

(cherry picked from commit eed7ea3a)

core/modules/rest/tests/src/Functional/CookieResourceTestTrait.php

@@ -109,10 +109,6 @@ protected function assertResponseWhenMissingAuthentication($method, ResponseInte
       if (in_array('user.permissions', $expected_cookie_403_cacheability->getCacheContexts(), TRUE)) {
         $expected_cookie_403_cacheability->addCacheTags(['config:user.role.anonymous']);
       }
-      // @todo Fix \Drupal\block\BlockAccessControlHandler::mergeCacheabilityFromConditions() in https://www.drupal.org/node/2867881
-      if (static::$entityTypeId === 'block') {
-        $expected_cookie_403_cacheability->setCacheTags(str_replace('user:2', 'user:0', $expected_cookie_403_cacheability->getCacheTags()));
-      }
       $this->assertResourceErrorResponse(403, FALSE, $response, $expected_cookie_403_cacheability->getCacheTags(), $expected_cookie_403_cacheability->getCacheContexts(), 'MISS', FALSE);
     }
     else {