MAGETWO-40252: Elimination of Layer supertype for Action controllers

    - Fix error caused by merge

Author: Yu Tang

app/code/Magento/Customer/Controller/Plugin/Account.php

@@ -50,7 +50,7 @@ public function aroundDispatch(
         $pattern = '/^(' . implode('|', $this->allowedActions) . ')$/i';
 
         if (!preg_match($pattern, $action)) {
-            if (!$this->session->authenticate($subject)) {
+            if (!$this->session->authenticate()) {
                 $subject->getActionFlag()->set('', ActionInterface::FLAG_NO_DISPATCH, true);
             }
         } else {

app/code/Magento/Customer/Test/Unit/Controller/Plugin/AccountTest.php

@@ -112,7 +112,6 @@ public function testAroundDispatch(
         } else {
             $this->session->expects($this->once())
                 ->method('authenticate')
-                ->with($this->subject)
                 ->willReturn($isAuthenticated);
             if (!$isAuthenticated) {
                 $this->subject->expects($this->once())