[Android] Refactor our notification channel definitions

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java
index 5070fedca1454a4b391550a83a3f9743ee2f9579..59e2f5bfa1209fd8ec1490b7e3aaf13aa04fe3ac 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationManagerProxy.java
@@ -6,6 +6,7 @@ package org.chromium.chrome.browser.notifications;
 
 import android.app.Notification;
 
+import org.chromium.chrome.browser.notifications.channels.Channel;
 import org.chromium.chrome.browser.notifications.channels.ChannelDefinitions;
 
 import java.util.List;
@@ -14,16 +15,17 @@ import java.util.List;
  * A proxy for the Android Notification Manager. This allows tests to be written without having to
  * use the real Notification Manager.
  *
- * @see http://developer.android.com/reference/android/app/NotificationManager.html
+ * @see <a href="https://developer.android.com/reference/android/app/NotificationManager.html">
+ *     https://developer.android.com/reference/android/app/NotificationManager.html</a>
  */
 public interface NotificationManagerProxy {
     void cancel(int id);
     void cancel(String tag, int id);
     void cancelAll();
-    void createNotificationChannel(ChannelDefinitions.Channel channel);
+    void createNotificationChannel(Channel channel);
     void createNotificationChannelGroup(ChannelDefinitions.ChannelGroup channelGroup);
-    List<String> getNotificationChannelIds();
-    void deleteNotificationChannel(@ChannelDefinitions.ChannelId String id);
+    List<Channel> getNotificationChannels();
+    void deleteNotificationChannel(String id);
 
     void notify(int id, Notification notification);
     void notify(String tag, int id, Notification notification);