Plumb Notification action icons through to the UI layer.

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

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java
index 4ad33f91505f570e9881f5abd337561b56557216..11a7dc24a5923236189ac173d8f3c501174f69ae 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilder.java
@@ -6,12 +6,9 @@
 
 import android.app.Notification;
 import android.content.Context;
-import android.support.v4.app.NotificationCompat;
-import android.support.v4.app.NotificationCompat.Action;
 
 /**
- * Builds a notification using the given inputs. Relies on NotificationCompat and
- * NotificationCompat.BigTextStyle to provide a standard layout.
+ * Builds a notification using the standard Notification.BigTextStyle layout.
  */
 public class StandardNotificationBuilder extends NotificationBuilderBase {
     private final Context mContext;
@@ -22,10 +19,9 @@ public StandardNotificationBuilder(Context context) {
 
     @Override
     public Notification build() {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
+        Notification.Builder builder = new Notification.Builder(mContext);

[Peter Beverloo, 2016/02/10 12:29:37]

Should we add a pedantic comment about being careful about checking API versions
because it's not a CompatBuilder?

[Michael van Ouwerkerk, 2016/02/10 17:18:12]

Should we really? Isn't that just going to fail on the try bots?

[Peter Beverloo, 2016/02/10 18:05:01]

I don't know which Android version the try-bots run on, but am fairly sure this
will move past JB at some point that may not be equal to our official OS
support.

We (the owners) know, so that works for me, but I'm not a huge fan of (partly)
silent failure vectors.

[Michael van Ouwerkerk, 2016/02/11 11:02:02]

I've added some notes.

         builder.setContentTitle(mTitle);
-        builder.setContentText(mBody).setStyle(
-                new NotificationCompat.BigTextStyle().bigText(mBody));
+        builder.setContentText(mBody).setStyle(new Notification.BigTextStyle().bigText(mBody));
         builder.setSubText(mOrigin);
         builder.setTicker(mTickerText);
         builder.setLargeIcon(mLargeIcon);
@@ -33,10 +29,10 @@ public Notification build() {
         builder.setContentIntent(mContentIntent);
         builder.setDeleteIntent(mDeleteIntent);
         for (Action action : mActions) {
-            builder.addAction(action);
+            addAction(builder, action);
         }
         if (mSettingsAction != null) {
-            builder.addAction(mSettingsAction);
+            addAction(builder, mSettingsAction);
         }
         builder.setDefaults(mDefaults);
         builder.setVibrate(mVibratePattern);