Abstracting over Notification.Builder + NotificationCompat.Builder

chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java

Index: chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
index 65275fcc18f0f679f1339960bfcf6d9ad2c26f01..b52b00a54695914f75394e7ece66c7a5cbaf68d7 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeApplication.java
@@ -25,6 +25,9 @@ import org.chromium.chrome.browser.document.DocumentActivity;
 import org.chromium.chrome.browser.document.IncognitoDocumentActivity;
 import org.chromium.chrome.browser.init.InvalidStartupDialog;
 import org.chromium.chrome.browser.metrics.UmaUtils;
+import org.chromium.chrome.browser.notifications.ChromeNotificationBuilder;
+import org.chromium.chrome.browser.notifications.NotificationBuilder;
+import org.chromium.chrome.browser.notifications.NotificationCompatBuilder;
 import org.chromium.chrome.browser.partnercustomizations.PartnerBrowserCustomizations;
 import org.chromium.chrome.browser.preferences.PreferencesLauncher;
 import org.chromium.chrome.browser.preferences.autofill.AutofillAndPaymentsPreferences;
@@ -194,4 +197,20 @@ public class ChromeApplication extends ContentApplication {
         }
         return sDocumentTabModelSelector;
     }
+
+    /**
+     * Creates either a Notification.Builder or NotificationCompat.Builder under the hood, wrapped
+     * in our own common interface. Should be used for all notifications we create.
+     *
+     * TODO(awdf) Remove this once we've updated to revision 26 of the support library.
+     *
+     * @param preferCompat if a NotificationCompat.Builder is preferred.
+     * @param notificationCategoryGroupId
+     * @param notificationCategoryGroupName
+     */
+    public ChromeNotificationBuilder createChromeNotificationBuilder(boolean preferCompat,
+            String notificationCategoryId, String notificationCategoryName,
+            String notificationCategoryGroupId, String notificationCategoryGroupName) {
+        return preferCompat ? new NotificationCompatBuilder(this) : new NotificationBuilder(this);
+    }
 }