Implement MediaMetadata artwork in content

content/renderer/media/android/webmediasession_android.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/android/webmediasession_android.h"
 
+#include <iterator>

[dcheng, 2016/07/06 02:34:15]

Nit: this include is no longer needed.

[Zhiqiang Zhang (Slow), 2016/07/06 15:38:38]

Done.

 #include <memory>
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "content/public/common/media_metadata.h"
 #include "content/renderer/media/android/renderer_media_session_manager.h"
+#include "third_party/WebKit/public/platform/WebIconSizesParser.h"
+#include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/WebKit/public/platform/modules/mediasession/WebMediaMetadata.h"
 
 namespace content {
 
 WebMediaSessionAndroid::WebMediaSessionAndroid(
     RendererMediaSessionManager* session_manager)
     : session_manager_(session_manager) {
   DCHECK(session_manager_);
   media_session_id_ = session_manager_->RegisterMediaSession(this);
 }
@@ skipping 12 matching lines @@
   session_manager_->Deactivate(media_session_id_, base::WrapUnique(callback));
 }
 
 void WebMediaSessionAndroid::setMetadata(
     const blink::WebMediaMetadata* web_metadata) {
   MediaMetadata metadata;
   if (web_metadata) {
     metadata.title = web_metadata->title;
     metadata.artist = web_metadata->artist;
     metadata.album = web_metadata->album;
+    for (const auto& web_artwork : web_metadata->artwork) {
+      MediaMetadata::Artwork artwork;
+      artwork.src = GURL(base::string16(web_artwork.src));
+      artwork.type = web_artwork.type;
+      blink::WebVector<blink::WebSize> web_sizes =
+          blink::WebIconSizesParser::parseIconSizes(web_artwork.sizes);
+      artwork.sizes.insert(artwork.sizes.end(),
+                           web_sizes.begin(),
+                           web_sizes.end());
+      metadata.artwork.push_back(artwork);
+    }
   }
 
   session_manager_->SetMetadata(media_session_id_, metadata);
 }
 
 }  // namespace content