Media Session API: use MediaMetadata in the browser process.

chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
index 67cd06f5aa0b811c30b9dcae8cedfc81d4260f19..fae5cc63ed6dd79864104d38e27b34842c506ac8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/media/ui/MediaNotificationManager.java
@@ -502,7 +502,7 @@ public class MediaNotificationManager {
             playPauseButtonId = R.id.button2;
         }
 
-        contentView.setTextViewText(R.id.title, mMediaNotificationInfo.title);
+        contentView.setTextViewText(R.id.title, mMediaNotificationInfo.metadata.title);
         contentView.setTextViewText(R.id.status, mMediaNotificationInfo.origin);
         if (mNotificationIcon != null) {
             contentView.setImageViewBitmap(R.id.icon, mNotificationIcon);
@@ -541,7 +541,7 @@ public class MediaNotificationManager {
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_TITLE,
-                    mMediaNotificationInfo.title);
+                    mMediaNotificationInfo.metadata.title);
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_DISPLAY_SUBTITLE,
                     mMediaNotificationInfo.origin);
             metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_DISPLAY_ICON,
@@ -554,12 +554,22 @@ public class MediaNotificationManager {
             }
         } else {
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_TITLE,
-                    mMediaNotificationInfo.title);
+                    mMediaNotificationInfo.metadata.title);
             metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST,
                     mMediaNotificationInfo.origin);
             metadataBuilder.putBitmap(MediaMetadataCompat.METADATA_KEY_ART, mediaSessionImage);
         }
 
+        // Set ARTIST and ALBUM metadata if they were specified.

[Ted C, 2016/03/01 17:18:11]

this comment seems superfluous...the code isn't that complex to need it (and
it's a bit confusing as it implies both are happening in the following block)

[mlamouri (slow - plz ping), 2016/03/16 15:47:15]

Done.

+        if (!mMediaNotificationInfo.metadata.artist.isEmpty()) {

[Ted C, 2016/03/01 17:18:11]

Use

TextUtils.isEmpty(mMediaNotificationInfo.metadata.artist)

[mlamouri (slow - plz ping), 2016/03/16 15:47:15]

Done.

+            metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ARTIST,
+                    mMediaNotificationInfo.metadata.artist);
+        }
+        if (!mMediaNotificationInfo.metadata.album.isEmpty()) {
+            metadataBuilder.putString(MediaMetadataCompat.METADATA_KEY_ALBUM,
+                    mMediaNotificationInfo.metadata.album);
+        }
+
         return metadataBuilder.build();
     }