[Android O] Refactor channel definitions into new class

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

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactory.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactory.java
index 5b00acf333bd0512475f8064250d355ef00507b8..43f90b621872b51bc77f333699e5dd584a998f43 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactory.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderFactory.java
@@ -31,7 +31,7 @@ public class NotificationBuilderFactory {
      *                  {@link ChannelsInitializer#ensureInitialized(String)}.
      */
     public static ChromeNotificationBuilder createChromeNotificationBuilder(
-            boolean preferCompat, @ChannelsInitializer.ChannelId String channelId) {
+            boolean preferCompat, @ChannelDefinitions.ChannelId String channelId) {
         Context context = ContextUtils.getApplicationContext();
         if (BuildInfo.isAtLeastO()) {
             return createNotificationBuilderForO(channelId, context);
@@ -42,9 +42,10 @@ public class NotificationBuilderFactory {
 
     @SuppressLint("NewApi") // for Context.getSystemService(Class)
     private static ChromeNotificationBuilder createNotificationBuilderForO(
-            @ChannelsInitializer.ChannelId String channelId, Context context) {
+            @ChannelDefinitions.ChannelId String channelId, Context context) {
         return new NotificationBuilderForO(context, channelId,
-                new ChannelsInitializer(new NotificationManagerProxyImpl(
-                        context.getSystemService(NotificationManager.class))));
+                new ChannelsInitializer(new NotificationManagerProxyImpl(context.getSystemService(
+                                                NotificationManager.class)),
+                        new ChannelDefinitions()));
     }
 }