Implement MediaMetadata artwork in content

content/public/common/media_metadata.h

Index: content/public/common/media_metadata.h
diff --git a/content/public/common/media_metadata.h b/content/public/common/media_metadata.h
index 3d7f13c59366caac20a29ed98b79c0d8a8478d58..eda167571d86d9da17261d90862e8a918e6ee982 100644
--- a/content/public/common/media_metadata.h
+++ b/content/public/common/media_metadata.h
@@ -5,20 +5,34 @@
 #ifndef CONTENT_PUBLIC_COMMON_MEDIA_METADATA_H_
 #define CONTENT_PUBLIC_COMMON_MEDIA_METADATA_H_
 
+#include <vector>
+
+#include "base/optional.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
+#include "content/public/common/manifest.h"
 
 namespace content {
 
 // The MediaMetadata is a structure carrying information associated to a
 // content::MediaSession.
 struct CONTENT_EXPORT MediaMetadata {
+  // TODO(zqzhang): move |Manifest::Icon| to a common place. See
+  // https://crbug.com/621859.
+  using Artwork = Manifest::Icon;
+
   MediaMetadata();
   ~MediaMetadata();
 
+  MediaMetadata(const MediaMetadata& other);
+
   bool operator==(const MediaMetadata& other) const;
   bool operator!=(const MediaMetadata& other) const;
 
+  // Apply validity checks and sanitize |artwork|. Returns null if
+  // |artwork| does not pass validity checks.
+  static base::Optional<Artwork> SanitizeArtwork(const Artwork& artwork);

[Zhiqiang Zhang (Slow), 2016/06/29 19:16:14]

For jochen@, copying previous comments here:

On 2016/06/27 08:12:40, jochen wrote:
The MediaMetadata class is used both in content/ and chrome/. Did you mean
moving this method to somewhere else in content/common/?

BTW, I think it's better to move all MediaMetadata sanitizing in one place. Now
some part is in SanitizeArtwork(), and some part is in
RendererMediaSessionManager/BrowserMediaSessionManager. Also we could have a
method for checking MediaMetadata is OK before sanitizing it so we can avoid
making another copy. Does this sound good to you?

[jochen (gone - plz use gerrit), 2016/07/01 14:18:56]

unifying this sounds good, yes

[Zhiqiang Zhang (Slow), 2016/07/01 21:05:34]

Done. See content/common/media/media_metadata_sanitizer.h

+
   // Title associated to the MediaSession.
   base::string16 title;
 
@@ -28,11 +42,17 @@ struct CONTENT_EXPORT MediaMetadata {
   // Album associated to the MediaSession.
   base::string16 album;
 
+  // Artwork associated to the MediaSession.
+  std::vector<Artwork> artwork;
+
   // Maximum length for all the strings inside the MediaMetadata when it is sent
   // over IPC. The renderer process should truncate the strings before sending
   // the MediaMetadata and the browser process must do the same when receiving
   // it.
   static const size_t kMaxIPCStringLength;
+
+  // Maximum number of artwork images inside the MediaMetadata.
+  static const size_t kMaxNumberOfArtworkImages;
 };
 
 }  // namespace content