commit d215c9ebc9c7ffa9367a37e84b3050b267100a32
Author: Pieter Frenssen <pieter@frenssen.be>
Date:   Sat Mar 29 01:29:23 2014 +0100

    2190313-42

diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 915a08a..d387b4c 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1044,7 +1044,7 @@ function comment_user_predelete($account) {
  */
 function comment_load_multiple(array $cids = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('comment')->resetCache($cids);
+    \Drupal::entityManager()->getStorage('comment')->resetCache($cids);
   }
   return Comment::loadMultiple($cids);
 }
@@ -1065,7 +1065,7 @@ function comment_load_multiple(array $cids = NULL, $reset = FALSE) {
  */
 function comment_load($cid, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('comment')->resetCache(array($cid));
+    \Drupal::entityManager()->getStorage('comment')->resetCache(array($cid));
   }
   return Comment::load($cid);
 }
diff --git a/core/modules/file/file.module b/core/modules/file/file.module
index a46ca14..f3fade4 100644
--- a/core/modules/file/file.module
+++ b/core/modules/file/file.module
@@ -90,7 +90,7 @@ function file_element_info() {
  */
 function file_load_multiple(array $fids = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('file')->resetCache($fids);
+    \Drupal::entityManager()->getStorage('file')->resetCache($fids);
   }
   return File::loadMultiple($fids);
 }
@@ -114,7 +114,7 @@ function file_load_multiple(array $fids = NULL, $reset = FALSE) {
  */
 function file_load($fid, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('file')->resetCache(array($fid));
+    \Drupal::entityManager()->getStorage('file')->resetCache(array($fid));
   }
   return File::load($fid);
 }
diff --git a/core/modules/menu_link/menu_link.module b/core/modules/menu_link/menu_link.module
index 8ce2bff..a95996c 100644
--- a/core/modules/menu_link/menu_link.module
+++ b/core/modules/menu_link/menu_link.module
@@ -50,7 +50,7 @@ function menu_link_uri(MenuLink $menu_link) {
  */
 function menu_link_load($mlid = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('menu_link')->resetCache(array($mlid));
+    \Drupal::entityManager()->getStorage('menu_link')->resetCache(array($mlid));
   }
   return MenuLink::load($mlid);
 }
@@ -74,7 +74,7 @@ function menu_link_load($mlid = NULL, $reset = FALSE) {
  */
 function menu_link_load_multiple(array $mlids = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('menu_link')->resetCache($mlids);
+    \Drupal::entityManager()->getStorage('menu_link')->resetCache($mlids);
   }
   return MenuLink::loadMultiple($mlids);
 }
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index e20d2b1..8b3fe3a 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -527,7 +527,7 @@ function node_type_update_nodes($old_id, $new_id) {
  */
 function node_load_multiple(array $nids = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('node')->resetCache($nids);
+    \Drupal::entityManager()->getStorage('node')->resetCache($nids);
   }
   return Node::loadMultiple($nids);
 }
@@ -549,7 +549,7 @@ function node_load_multiple(array $nids = NULL, $reset = FALSE) {
  */
 function node_load($nid = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('node')->resetCache(array($nid));
+    \Drupal::entityManager()->getStorage('node')->resetCache(array($nid));
   }
   return Node::load($nid);
 }
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index ca41117..ca45e3a 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -268,7 +268,7 @@ function user_entity_extra_field_info() {
  */
 function user_load_multiple(array $uids = NULL, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('user')->resetCache($uids);
+    \Drupal::entityManager()->getStorage('user')->resetCache($uids);
   }
   return User::loadMultiple($uids);
 }
@@ -302,7 +302,7 @@ function user_load_multiple(array $uids = NULL, $reset = FALSE) {
  */
 function user_load($uid, $reset = FALSE) {
   if ($reset) {
-    \Drupal::entityManager()->getStorageController('user')->resetCache(array($uid));
+    \Drupal::entityManager()->getStorage('user')->resetCache(array($uid));
   }
   return User::load($uid);
 }