Merge branch 'result_factory' into MAGETWO-36105

Author: Yuri Kovsher

lib/internal/Magento/Framework/App/Action/AbstractAction.php

@@ -24,6 +24,11 @@ abstract class AbstractAction implements \Magento\Framework\App\ActionInterface
      */
     protected $resultRedirectFactory;
 
+    /**
+     * @var \Magento\Framework\Controller\ResultFactory;
+     */
+    protected $resultFactory;
+
     /**
      * @param \Magento\Framework\App\Action\Context $context
      */
@@ -33,6 +38,7 @@ public function __construct(
         $this->_request = $context->getRequest();
         $this->_response = $context->getResponse();
         $this->resultRedirectFactory = $context->getResultRedirectFactory();
+        $this->resultFactory = $context->getResultFactory();
     }
 
     /**

lib/internal/Magento/Framework/App/Action/Context.php

@@ -184,4 +184,12 @@ public function getResultRedirectFactory()
     {
         return $this->resultRedirectFactory;
     }
+
+    /**
+     * @return \Magento\Framework\Controller\ResultFactory
+     */
+    public function getResultFactory()
+    {
+        return $this->resultFactory;
+    }
 }