diff --git a/core/modules/comment/comment.admin.inc b/core/modules/comment/comment.admin.inc
index 0418b1d..488c2f9 100644
--- a/core/modules/comment/comment.admin.inc
+++ b/core/modules/comment/comment.admin.inc
@@ -262,17 +262,14 @@ function comment_multiple_delete_confirm_submit($form, &$form_state) {
 /**
  * Page callback: Shows a confirmation page for comment deletions.
  *
- * @param $cid
- *   The ID of the comment that is about to be deleted.
+ * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment
+ *   The comment entity that is about to be deleted.
  *
  * @see comment_menu()
  * @see comment_confirm_delete()
  */
-function comment_confirm_delete_page($cid) {
-  if ($comment = comment_load($cid)) {
-    return drupal_get_form('comment_confirm_delete', $comment);
-  }
-  throw new NotFoundHttpException();
+function comment_confirm_delete_page(Comment $comment) {
+  return drupal_get_form('comment_confirm_delete', $comment);
 }
 
 /**
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 6f2795a..852666a 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -242,13 +242,14 @@ function comment_menu() {
     'access arguments' => array('administer comments'),
     'type' => MENU_LOCAL_TASK,
   );
-  $items['comment/%'] = array(
+  $items['comment/%comment'] = array(
     'title' => 'Comment permalink',
     'page callback' => 'comment_permalink',
     'page arguments' => array(1),
-    'access arguments' => array('access comments'),
+    'access callback' => 'entity_page_access',
+    'access arguments' => array(1, 'view'),
   );
-  $items['comment/%/view'] = array(
+  $items['comment/%comment/view'] = array(
     'title' => 'View comment',
     'type' => MENU_DEFAULT_LOCAL_TASK,
     'weight' => -10,
@@ -259,24 +260,26 @@ function comment_menu() {
     'title' => 'Edit',
     'page callback' => 'comment_edit_page',
     'page arguments' => array(1),
-    'access callback' => 'comment_access',
-    'access arguments' => array('edit', 1),
+    'access callback' => 'entity_page_access',
+    'access arguments' => array(1, 'update'),
     'type' => MENU_LOCAL_TASK,
     'weight' => 0,
   );
-  $items['comment/%/approve'] = array(
+  $items['comment/%comment/approve'] = array(
     'title' => 'Approve',
     'page callback' => 'comment_approve',
     'page arguments' => array(1),
-    'access arguments' => array('administer comments'),
+    'access callback' => 'entity_page_access',
+    'access arguments' => array(1, 'approve'),
     'file' => 'comment.pages.inc',
     'weight' => 1,
   );
-  $items['comment/%/delete'] = array(
+  $items['comment/%comment/delete'] = array(
     'title' => 'Delete',
     'page callback' => 'comment_confirm_delete_page',
     'page arguments' => array(1),
-    'access arguments' => array('administer comments'),
+    'access callback' => 'entity_page_access',
+    'access arguments' => array(1, 'delete'),
     'type' => MENU_LOCAL_TASK,
     'file' => 'comment.admin.inc',
     'weight' => 2,
@@ -434,15 +437,14 @@ function comment_permission() {
  * calculates the page number based on current comment settings and returns
  * the full comment view with the pager set dynamically.
  *
- * @param $cid
- *   A comment identifier.
+ * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment
+ *   A comment entity.
  *
  * @return
  *   The comment listing set to the page on which the comment appears.
  */
-function comment_permalink($cid) {
-  if (($comment = comment_load($cid)) && ($node = $comment->nid->entity)) {
-
+function comment_permalink(Comment $comment) {
+  if ($node = $comment->nid->entity) {
     // Find the current display page for this comment.
     $page = comment_get_display_page($comment->id(), $node->type);
 
@@ -958,7 +960,7 @@ function comment_links(Comment $comment, Node $node) {
       }
     }
     elseif (user_access('post comments')) {
-      if (comment_access('edit', $comment)) {
+      if ($comment->access('update')) {
         $links['comment-edit'] = array(
           'title' => t('edit'),
           'href' => "comment/{$comment->id()}/edit",
@@ -1336,30 +1338,6 @@ function comment_user_predelete($account) {
 }
 
 /**
- * Determines whether the current user has access to a particular comment.
- *
- * Authenticated users can edit their comments as long they have not been
- * replied to. This prevents people from changing or revising their statements
- * based on the replies to their posts.
- *
- * @param $op
- *   The operation that is to be performed on the comment. Only 'edit' is
- *   recognized now.
- * @param Drupal\comment\Comment $comment
- *   The comment object.
- *
- * @return
- *   TRUE if the current user has acces to the comment, FALSE otherwise.
- */
-function comment_access($op, Comment $comment) {
-  global $user;
-
-  if ($op == 'edit') {
-    return ($user->uid && $user->uid == $comment->uid->target_id && $comment->status->value == COMMENT_PUBLISHED && user_access('edit own comments')) || user_access('administer comments');
-  }
-}
-
-/**
  * Accepts a submission of new or changed comment content.
  *
  * @param Drupal\comment\Comment $comment
diff --git a/core/modules/comment/comment.pages.inc b/core/modules/comment/comment.pages.inc
index da359a4..ddae32e 100644
--- a/core/modules/comment/comment.pages.inc
+++ b/core/modules/comment/comment.pages.inc
@@ -5,9 +5,9 @@
  * User page callbacks for the Comment module.
  */
 
+use Drupal\comment\Plugin\Core\Entity\Comment;
 use Drupal\node\Plugin\Core\Entity\Node;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 /**
  * Form constructor for the comment reply form.
@@ -102,26 +102,23 @@ function comment_reply(Node $node, $pid = NULL) {
 /**
  * Page callback: Publishes the specified comment.
  *
- * @param $cid
- *   A comment identifier.
+ * @param \Drupal\comment\Plugin\Core\Entity\Comment $comment
+ *   A comment entity.
  *
  * @see comment_menu()
  */
-function comment_approve($cid) {
+function comment_approve(Comment $comment) {
   // @todo CSRF tokens are validated in page callbacks rather than access
   //   callbacks, because access callbacks are also invoked during menu link
   //   generation. Add token support to routing: http://drupal.org/node/755584.
   $token = drupal_container()->get('request')->query->get('token');
-  if (!isset($token) || !drupal_valid_token($token, "comment/$cid/approve")) {
+  if (!isset($token) || !drupal_valid_token($token, 'comment/' . $comment->id() . '/approve')) {
     throw new AccessDeniedHttpException();
   }
 
-  if ($comment = comment_load($cid)) {
-    $comment->status->value = COMMENT_PUBLISHED;
-    comment_save($comment);
+  $comment->status->value = COMMENT_PUBLISHED;
+  $comment->save();
 
-    drupal_set_message(t('Comment approved.'));
-    drupal_goto('node/' . $comment->nid->target_id);
-  }
-  throw new NotFoundHttpException();
+  drupal_set_message(t('Comment approved.'));
+  drupal_goto('node/' . $comment->nid->target_id);
 }
diff --git a/core/modules/comment/lib/Drupal/comment/CommentAccessController.php b/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
new file mode 100644
index 0000000..791dc4d
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/CommentAccessController.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\comment\CommentAccessController
+ */
+
+namespace Drupal\comment;
+
+use Drupal\Core\Entity\EntityAccessController;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\user\Plugin\Core\Entity\User;
+
+/**
+ * Access controller for the comment entity.
+ *
+ * @see \Drupal\comment\Plugin\Core\Entity\Comment.
+ */
+class CommentAccessController extends EntityAccessController implements CommentAccessControllerInterface {
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityAccessController::viewAccess().
+   */
+  public function viewAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
+    return user_access('access comments', $account);
+  }
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityAccessController::createAccess().
+   */
+  public function createAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
+    return user_access('post comments', $account);
+  }
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityAccessController::updateAccess().
+   */
+  public function updateAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
+    // If no user is specified fill in the current one.
+    if (!isset($account)) {
+      $account = $GLOBALS['user'];
+    }
+    return ($account->uid && $account->uid == $entity->uid->value && $entity->status->value == COMMENT_PUBLISHED && user_access('edit own comments', $account)) || user_access('administer comments', $account);
+  }
+
+  /**
+   * Overrides \Drupal\Core\Entity\EntityAccessController::deleteAccess().
+   */
+  public function deleteAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
+    return user_access('administer comments', $account);
+  }
+
+  /**
+   * Implements \Drupal\comment\CommentAccessControllerInterface::approveAccess().
+   */
+  public function approveAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL) {
+    return user_access('administer comments', $account);
+  }
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/CommentAccessControllerInterface.php b/core/modules/comment/lib/Drupal/comment/CommentAccessControllerInterface.php
new file mode 100644
index 0000000..f611471
--- /dev/null
+++ b/core/modules/comment/lib/Drupal/comment/CommentAccessControllerInterface.php
@@ -0,0 +1,39 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\comment\CommentAccessControllerInterface.
+ */
+
+namespace Drupal\comment;
+
+use Drupal\Core\Entity\EntityAccessControllerInterface;
+use Drupal\Core\Entity\EntityInterface;
+use Drupal\user\Plugin\Core\Entity\User;
+
+/**
+ * Defines an interface for comment access controller.
+ *
+ * Additional to EntityAccessControllerInterface this adds an access method for
+ * approving a comment.
+ */
+interface CommentAccessControllerInterface extends EntityAccessControllerInterface {
+
+  /**
+   * Checks 'approve' access for a given entity or entity translation.
+   *
+   * @param \Drupal\Core\Entity\EntityInterface $entity
+   *   The entity for which to check 'delete' access.
+   * @param string $langcode
+   *   (optional) The language code for which to check access. Defaults to
+   *   LANGUAGE_DEFAULT.
+   * @param \Drupal\user\Plugin\Core\Entity\User $account
+   *   (optional) The user for which to check access, or NULL to check access
+   *   for the current user. Defaults to NULL.
+   *
+   * @return bool
+   *   TRUE if access was granted, FALSE otherwise.
+   */
+  public function approveAccess(EntityInterface $entity, $langcode = LANGUAGE_DEFAULT, User $account = NULL);
+
+}
diff --git a/core/modules/comment/lib/Drupal/comment/CommentTranslationController.php b/core/modules/comment/lib/Drupal/comment/CommentTranslationController.php
index 644694f..656af99 100644
--- a/core/modules/comment/lib/Drupal/comment/CommentTranslationController.php
+++ b/core/modules/comment/lib/Drupal/comment/CommentTranslationController.php
@@ -17,23 +17,6 @@
 class CommentTranslationController extends EntityTranslationControllerNG {
 
   /**
-   * Overrides EntityTranslationController::getAccess().
-   */
-  public function getAccess(EntityInterface $entity, $op) {
-    switch ($op) {
-      case 'view':
-        return user_access('access comments');
-      case 'update':
-        return comment_access('edit', $entity);
-      case 'delete':
-        return user_access('administer comments');
-      case 'create':
-        return user_access('post comments');
-    }
-    return parent::getAccess($entity, $op);
-  }
-
-  /**
    * Overrides EntityTranslationController::entityFormTitle().
    */
   protected function entityFormTitle(EntityInterface $entity) {
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
index bccf85d..650d306 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
@@ -21,6 +21,7 @@
  *   bundle_label = @Translation("Content type"),
  *   module = "comment",
  *   controller_class = "Drupal\comment\CommentStorageController",
+ *   access_controller_class = "Drupal\comment\CommentAccessController",
  *   render_controller_class = "Drupal\comment\CommentRenderController",
  *   form_controller_class = {
  *     "default" = "Drupal\comment\CommentFormController"
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
index 4a17fe7..53c358a 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkEdit.php
@@ -44,7 +44,7 @@ function render_link($data, $values) {
     parent::render_link($data, $values);
     // ensure user has access to edit this comment.
     $comment = $this->get_value($values);
-    if (!comment_access('edit', $comment)) {
+    if (!$comment->access('update')) {
       return;
     }