Merge branch 'MAGETWO-26227-Upload-Image-Attribute' into develop

Conflicts:
	dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php

Author: anupdugar

app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryContentInterface.php

@@ -112,14 +112,14 @@ public function setFile($file);
     /**
      * Get media gallery content
      *
-     * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryContentInterface|null
+     * @return \Magento\Framework\Api\Data\ImageContentInterface|null
      */
     public function getContent();
 
     /**
      * Set media gallery content
      *
-     * @param $content \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryContentInterface
+     * @param $content \Magento\Framework\Api\Data\ImageContentInterface
      * @return $this 
      */
     public function setContent($content);

app/code/Magento/Catalog/Api/Data/ProductAttributeMediaGalleryEntryInterface.php

@@ -12,7 +12,7 @@
 use Magento\Framework\Object\IdentityInterface;
 use Magento\Framework\Pricing\Object\SaleableInterface;
 use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface;
-use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryContentInterface;
+use Magento\Framework\Api\Data\ImageContentInterface;
 
 /**
  * Catalog product model
@@ -2519,19 +2519,21 @@ public function getMediaGalleryEntries()
     }
 
     /**
-     * @param ProductAttributeMediaGalleryEntryContentInterface $content
+     * @param ImageContentInterface $content
      * @return array
      */
     protected function convertFromMediaGalleryEntryContentInterface(
-        ProductAttributeMediaGalleryEntryContentInterface $content = null
+        ImageContentInterface $content = null
     ) {
         if ($content == null) {
             return null;
         } else {
             return [
-                "entry_data" => $content->getEntryData(),
-                "mime_type" => $content->getMimeType(),
-                "name" => $content->getName(),
+                'data' => [
+                    ImageContentInterface::BASE64_ENCODED_DATA => $content->getBase64EncodedData(),
+                    ImageContentInterface::TYPE => $content->getType(),
+                    ImageContentInterface::NAME => $content->getName(),
+                ],
             ];
         }
     }

app/code/Magento/Catalog/Model/Product.php

@@ -76,7 +76,7 @@ public function getFile()
     }
 
     /**
-     * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryContentInterface|null
+     * @return \Magento\Framework\Api\Data\ImageContentInterface|null
      */
     public function getContent()
     {
@@ -141,7 +141,7 @@ public function setFile($file)
     /**
      * Set media gallery content
      *
-     * @param $content \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryContentInterface
+     * @param $content \Magento\Framework\Api\Data\ImageContentInterface
      * @return $this
      */
     public function setContent($content)

app/code/Magento/Catalog/Model/Product/Gallery/Entry.php

@@ -11,6 +11,7 @@
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\StateException;
+use Magento\Framework\Api\ImageContentValidatorInterface;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -28,21 +29,21 @@ class GalleryManagement implements \Magento\Catalog\Api\ProductAttributeMediaGal
     protected $productRepository;
 
     /**
-     * @var \Magento\Catalog\Model\Product\Gallery\ContentValidator
+     * @var ImageContentValidatorInterface
      */
     protected $contentValidator;
 
     /**
      * @param \Magento\Store\Model\StoreManagerInterface $storeManager
      * @param \Magento\Catalog\Api\ProductRepositoryInterface $productRepository
-     * @param ContentValidator $contentValidator
+     * @param ImageContentValidatorInterface $contentValidator
      *
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Magento\Catalog\Api\ProductRepositoryInterface $productRepository,
-        \Magento\Catalog\Model\Product\Gallery\ContentValidator $contentValidator
+        ImageContentValidatorInterface $contentValidator
     ) {
         $this->productRepository = $productRepository;
         $this->storeManager = $storeManager;

app/code/Magento/Catalog/Model/Product/Gallery/GalleryManagement.php

@@ -6,9 +6,6 @@
  */
 namespace Magento\Catalog\Model\Product\Gallery;
 
-use Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryContentInterface;
-use Magento\Framework\Exception\InputException;
-
 class MimeTypeExtensionMap
 {
     /**