Reland "[Media Session] [2/4] Move Metadata to service"

This is a reland of 0475617f

Binary-Size: Adding duplicate classes that will be removed
in https://crrev.com/c/1241554

TBR=mlamouri@chromium.org,tedchoc@chromium.org

Original change's description:
> [Media Session] [2/4] Move Metadata to service
>
> This CL moves any existing uses in Android of MediaMetadata
> to the new version in the media_session service.
>
> BUG=875004
>
> Binary-Size: Adding duplicate classes that will be removed
> in https://crrev.com/c/1241554
>
> Change-Id: I8ed9afd45a37e515ae89d5d82a542a6f4c139136
> Reviewed-on: https://chromium-review.googlesource.com/c/1241466
> Commit-Queue: Becca Hughes <beccahughes@chromium.org>
> Reviewed-by: Ted Choc <tedchoc@chromium.org>
> Reviewed-by: Mounir Lamouri <mlamouri@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#605498}

Bug: 875004
Change-Id: I4689ac36b9dcf6b0582d4789016e238811b498e2
Reviewed-on: https://chromium-review.googlesource.com/c/1318809Reviewed-by: Becca Hughes <beccahughes@chromium.org>
Commit-Queue: Becca Hughes <beccahughes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612490}

chrome/android/BUILD.gn

@@ -295,6 +295,7 @@ android_library("chrome_java") {
     "//net/android:net_java",
     "//printing:printing_java",
     "//services/data_decoder/public/cpp/android:safe_json_java",
+    "//services/media_session/public/cpp/android:media_session_java",
     "//services/media_session/public/mojom:mojom_java",
     "//services/network/public/mojom:mojom_java",
     "//services/service_manager/public/java:service_manager_java",
@@ -544,6 +545,7 @@ junit_binary("chrome_junit_tests") {
     "//mojo/public/java:bindings_java",
     "//mojo/public/java:system_java",
     "//net/android:net_java",
+    "//services/media_session/public/cpp/android:media_session_java",
     "//third_party/android_deps:android_arch_lifecycle_common_java",
     "//third_party/android_deps:android_support_annotations_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",

chrome/android/DEPS

@@ -7,4 +7,5 @@ include_rules = [
   "+components/spellcheck/browser",
   "+jni",
   "+media/base/android/java",
+  "+services/media_session/public",
 ]

chrome/android/java/src/org/chromium/chrome/browser/media/remote/CastNotificationControl.java

@@ -23,7 +23,7 @@ import org.chromium.chrome.browser.media.ui.MediaNotificationManager;
 import org.chromium.chrome.browser.metrics.MediaNotificationUma;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.components.url_formatter.UrlFormatter;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.net.URI;
 import java.net.URISyntaxException;

chrome/android/java/src/org/chromium/chrome/browser/media/router/CastSessionUtil.java

@@ -8,7 +8,7 @@ import com.google.android.gms.cast.CastDevice;
 import com.google.android.gms.cast.RemoteMediaPlayer;
 
 import org.chromium.chrome.browser.media.ui.MediaNotificationInfo;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 /**
  * Helper class that implements functions useful to all CastSession types.

chrome/android/java/src/org/chromium/chrome/browser/media/router/caf/CafNotificationController.java

@@ -16,7 +16,7 @@ import org.chromium.chrome.browser.media.ui.MediaNotificationListener;
 import org.chromium.chrome.browser.media.ui.MediaNotificationManager;
 import org.chromium.chrome.browser.metrics.MediaNotificationUma;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 /** Controller for updating media notification for Casting and MediaFling. */
 public class CafNotificationController implements MediaNotificationListener {

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

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.media.ui;
 
-import static org.chromium.content_public.common.MediaMetadata.MediaImage;
+import static org.chromium.services.media_session.MediaMetadata.MediaImage;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;

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

@@ -9,7 +9,7 @@ import android.graphics.Bitmap;
 import android.text.TextUtils;
 
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.HashSet;
 import java.util.Set;

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

@@ -47,8 +47,8 @@ import org.chromium.chrome.browser.notifications.NotificationBuilderFactory;
 import org.chromium.chrome.browser.notifications.NotificationConstants;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
 import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
-import org.chromium.content_public.common.MediaMetadata;
 import org.chromium.media_session.mojom.MediaSessionAction;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.ArrayList;
 import java.util.HashSet;

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

@@ -27,8 +27,8 @@ import org.chromium.components.url_formatter.UrlFormatter;
 import org.chromium.content_public.browser.MediaSession;
 import org.chromium.content_public.browser.MediaSessionObserver;
 import org.chromium.content_public.browser.WebContents;
-import org.chromium.content_public.common.MediaMetadata;
 import org.chromium.media_session.mojom.MediaSessionAction;
+import org.chromium.services.media_session.MediaMetadata;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.net.URI;

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaImageManagerTest.java

@@ -15,7 +15,7 @@ import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import static org.chromium.content_public.common.MediaMetadata.MediaImage;
+import static org.chromium.services.media_session.MediaMetadata.MediaImage;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
@@ -296,4 +296,4 @@ public class MediaImageManagerTest {
         verify(mCallback).onImageDownloaded((Bitmap) isNull());
         verify(mCallback, times(0)).onImageDownloaded((Bitmap) isNotNull());
     }
-}
+}
\ No newline at end of file

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerNotificationTest.java

@@ -26,7 +26,7 @@ import org.robolectric.shadows.ShadowNotification;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 /**
  * JUnit tests for checking MediaNotificationManager presents correct notification to Android

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerServiceLifecycleTest.java

@@ -36,7 +36,7 @@ import org.robolectric.shadows.ShadowNotificationManager;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.browser.media.ui.MediaNotificationManager.ListenerService;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.concurrent.TimeoutException;
 

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationManagerTestBase.java

@@ -38,7 +38,7 @@ import org.chromium.chrome.browser.AppHooksImpl;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.media.ui.MediaNotificationManager.ListenerService;
 import org.chromium.chrome.browser.notifications.NotificationUmaTracker;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.HashMap;
 import java.util.Map;

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTestTabHolder.java

@@ -17,7 +17,7 @@ import org.chromium.chrome.browser.favicon.LargeIconBridge;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.content_public.browser.MediaSession;
 import org.chromium.content_public.browser.WebContents;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.Set;
 

chrome/android/junit/src/org/chromium/chrome/browser/media/ui/MediaNotificationTitleUpdatedTest.java

@@ -23,7 +23,7 @@ import org.robolectric.shadows.ShadowNotification;
 import org.chromium.base.test.BaseRobolectricTestRunner;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.media.ui.MediaNotificationManager.ListenerService;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 /**
  * Test of media notifications to see whether the text updates when the tab title changes or the

content/public/android/BUILD.gn

@@ -70,6 +70,7 @@ android_library("content_java") {
     "//net/android:net_java",
     "//services/device:java",
     "//services/device/public/java:nfc_java",
+    "//services/media_session/public/cpp/android:media_session_java",
     "//services/service_manager/public/java:service_manager_java",
     "//services/service_manager/public/mojom:mojom_java",
     "//services/shape_detection:shape_detection_java",

content/public/android/DEPS

@@ -9,4 +9,6 @@ include_rules = [
   "+device",
   # Needed for implementing Device Service public component in java.
   "+services/device/public/java",
+  # Needed for implementing Media Session on Android.
+  "+services/media_session/public",
 ]

content/public/android/java/src/org/chromium/content/browser/MediaSessionImpl.java

@@ -10,7 +10,7 @@ import org.chromium.base.annotations.JNINamespace;
 import org.chromium.content_public.browser.MediaSession;
 import org.chromium.content_public.browser.MediaSessionObserver;
 import org.chromium.content_public.browser.WebContents;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.HashSet;
 

content/public/android/java/src/org/chromium/content_public/browser/MediaSessionObserver.java

@@ -7,7 +7,7 @@ package org.chromium.content_public.browser;
 import android.support.annotation.Nullable;
 
 import org.chromium.content.browser.MediaSessionImpl;
-import org.chromium.content_public.common.MediaMetadata;
+import org.chromium.services.media_session.MediaMetadata;
 
 import java.util.Set;