Merge remote-tracking branch 'origin/MAGETWO-52923-Varnish-ssl' into pr

Author: Igor Melnikov

lib/internal/Magento/Framework/App/Test/Unit/Request/HttpTest.php

@@ -79,8 +79,8 @@ public function tearDown()
      */
     private function getModel($uri = null, $mockAppConfig = true)
     {
-        $testFrameworkObjectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager ($this);
-        $model = $testFrameworkObjectManager->getObject(
+
+        $model = $this->objectManager->getObject(
             'Magento\Framework\App\Request\Http',
             [
                 'routeConfig' => $this->_routerListMock,
@@ -93,7 +93,7 @@ private function getModel($uri = null, $mockAppConfig = true)
 
         if($mockAppConfig){
             $MockAppConfig = $this->getMock(\Magento\Framework\App\Config::class, [], [], '' , false);
-            $testFrameworkObjectManager->setBackwardCompatibleProperty($model, 'appConfig', $MockAppConfig );
+            $this->objectManager->setBackwardCompatibleProperty($model, 'appConfig', $MockAppConfig );
         }
 
         return $model;
@@ -346,9 +346,9 @@ public function testIsSecure($isSecure, $serverHttps, $headerOffloadKey, $header
             ->method('getValue')
             ->with(\Magento\Framework\App\Request\Http::XML_PATH_OFFLOADER_HEADER, ScopeConfigInterface::SCOPE_TYPE_DEFAULT)
             ->willReturn($configOffloadHeader);
-        $testFrameworkObjectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager ($this);
-        $testFrameworkObjectManager->setBackwardCompatibleProperty($this->_model,"appConfig" ,$configMock);
-        $testFrameworkObjectManager->setBackwardCompatibleProperty($this->_model,"SSLOffloadHeader" ,null );
+
+        $this->objectManager->setBackwardCompatibleProperty($this->_model,'appConfig' ,$configMock);
+        $this->objectManager->setBackwardCompatibleProperty($this->_model, 'SSLOffloadHeader' ,null );
 
         $this->_model->getServer()->set($headerOffloadKey, $headerOffloadValue);
         $this->_model->getServer()->set('HTTPS', $serverHttps);