Abstracting over Notification.Builder + NotificationCompat.Builder

chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java
index a8e3557d1a7a452bd1436b1315d14210b4f034bd..764734cb2e62016db49e214d0980e25a9c67bd70 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/incognito/IncognitoNotificationManager.java
@@ -7,10 +7,11 @@ package org.chromium.chrome.browser.incognito;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat;
 
 import org.chromium.base.ContextUtils;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.ChromeApplication;
+import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
 import org.chromium.chrome.browser.notifications.NotificationConstants;
 
 /**
@@ -29,17 +30,24 @@ public class IncognitoNotificationManager {
                 context.getResources().getString(R.string.close_all_incognito_notification);
         String title = context.getResources().getString(R.string.app_name);
 
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(context)
-                .setContentTitle(title)
-                .setContentIntent(
-                        IncognitoNotificationService.getRemoveAllIncognitoTabsIntent(context))
-                .setContentText(actionMessage)
-                .setOngoing(true)
-                .setVisibility(Notification.VISIBILITY_SECRET)
-                .setSmallIcon(R.drawable.incognito_statusbar)
-                .setShowWhen(false)
-                .setLocalOnly(true)
-                .setGroup(NotificationConstants.GROUP_INCOGNITO);
+        ChromeNotificationBuilder builder =
+                ((ChromeApplication) context)
+                        .createChromeNotificationBuilder(true /* preferCompat */,
+                                NotificationConstants.CATEGORY_ID_BROWSER,
+                                context.getString(R.string.notification_category_browser),
+                                NotificationConstants.CATEGORY_GROUP_ID_GENERAL,
+                                context.getString(R.string.notification_category_group_general))
+                        .setContentTitle(title)
+                        .setContentIntent(
+                                IncognitoNotificationService.getRemoveAllIncognitoTabsIntent(
+                                        context))
+                        .setContentText(actionMessage)
+                        .setOngoing(true)
+                        .setVisibility(Notification.VISIBILITY_SECRET)
+                        .setSmallIcon(R.drawable.incognito_statusbar)
+                        .setShowWhen(false)
+                        .setLocalOnly(true)
+                        .setGroup(NotificationConstants.GROUP_INCOGNITO);
         NotificationManager nm =
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         nm.notify(INCOGNITO_TABS_OPEN_TAG, INCOGNITO_TABS_OPEN_ID, builder.build());