diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
index d6e1c45..0c5a228 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
@@ -269,8 +269,6 @@ public function restoreHeaders() {
    *   The generated cache ID.
    */
   public function generateResultsKey() {
-    global $user;
-
     if (!isset($this->resultsKey)) {
       $build_info = $this->view->build_info;
 
@@ -283,6 +281,7 @@ public function generateResultsKey() {
           $build_info[$index] = (string)$query;
         }
       }
+      $user = \Drupal::currentUser();
       $key_data = array(
         'build_info' => $build_info,
         'roles' => $user->getRoles(),
@@ -310,8 +309,8 @@ public function generateResultsKey() {
    *   The generated cache ID.
    */
   public function generateOutputKey() {
-    global $user;
     if (!isset($this->outputKey)) {
+      $user = \Drupal::currentUser();
       $key_data = array(
         'result' => $this->view->result,
         'roles' => $user->getRoles(),
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 388d599..9298fa1 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -2529,8 +2529,7 @@ public function renderArea($area, $empty = FALSE) {
    */
   public function access($account = NULL) {
     if (!isset($account)) {
-      global $user;
-      $account = $user;
+      $account = \Drupal::currentUser();
     }
 
     // Full override.
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 316f980..d055c53 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -1355,7 +1355,7 @@ public function storeExposedInput($input, $status) {
     }
 
     // Check if we store exposed value for current user.
-    global $user;
+    $user = \Drupal::currentUser();
     $allowed_rids = empty($this->options['expose']['remember_roles']) ? array() : array_filter($this->options['expose']['remember_roles']);
     $intersect_rids = array_intersect(array_keys($allowed_rids), $user->getRoles());
     if (empty($intersect_rids)) {
diff --git a/core/modules/views/lib/Drupal/views/ViewExecutable.php b/core/modules/views/lib/Drupal/views/ViewExecutable.php
index f6ee156..9e91455 100644
--- a/core/modules/views/lib/Drupal/views/ViewExecutable.php
+++ b/core/modules/views/lib/Drupal/views/ViewExecutable.php
@@ -1523,7 +1523,7 @@ public function access($displays = NULL, $account = NULL) {
     }
 
     if (!$account) {
-      $account = $GLOBALS['user'];
+      $account = \Drupal::currentUser();
     }
 
     // We can't use choose_display() here because that function