| Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java
 | 
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java
 | 
| index 9d321fd1df421208d567252fceccc80f944b8b9b..4d86567f7987f28766a92ecb04e44eb803cf0863 100644
 | 
| --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java
 | 
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationBuilderBase.java
 | 
| @@ -405,7 +405,7 @@ public abstract class NotificationBuilderBase {
 | 
|       */
 | 
|      @TargetApi(Build.VERSION_CODES.M) // For the Icon class.
 | 
|      protected static void setSmallIconOnBuilder(
 | 
| -            Notification.Builder builder, int iconId, @Nullable Bitmap iconBitmap) {
 | 
| +            ChromeNotificationBuilder builder, int iconId, @Nullable Bitmap iconBitmap) {
 | 
|          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && iconBitmap != null) {
 | 
|              builder.setSmallIcon(Icon.createWithBitmap(iconBitmap));
 | 
|          } else {
 | 
| @@ -418,7 +418,7 @@ public abstract class NotificationBuilderBase {
 | 
|       * level is high enough, otherwise a resource id is used.
 | 
|       */
 | 
|      @SuppressWarnings("deprecation") // For addAction(int, CharSequence, PendingIntent)
 | 
| -    protected static void addActionToBuilder(Notification.Builder builder, Action action) {
 | 
| +    protected static void addActionToBuilder(ChromeNotificationBuilder builder, Action action) {
 | 
|          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT_WATCH) {
 | 
|              // Notification.Action.Builder and RemoteInput were added in KITKAT_WATCH.
 | 
|              Notification.Action.Builder actionBuilder = getActionBuilder(action);
 | 
| @@ -441,7 +441,7 @@ public abstract class NotificationBuilderBase {
 | 
|       * posted for notifications in the group to appear grouped in the notification shade.
 | 
|       */
 | 
|      @SuppressLint("NewApi") // For setGroup
 | 
| -    static void setGroupOnBuilder(Notification.Builder builder, CharSequence origin) {
 | 
| +    static void setGroupOnBuilder(ChromeNotificationBuilder builder, CharSequence origin) {
 | 
|          if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT_WATCH || origin == null) return;
 | 
|          builder.setGroup(NotificationConstants.GROUP_WEB_PREFIX + origin);
 | 
|          // TODO(crbug.com/674927) Post a group summary notification.
 | 
| 
 |