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 44312ba6f0456b519edb7a19fb39e332707e91e4..f7e0d3373101df13363c01601617caaf461eed2f 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,11 @@ public StandardNotificationBuilder(Context context) {
 
     @Override
     public Notification build() {
-        NotificationCompat.Builder builder = new NotificationCompat.Builder(mContext);
+        // Note: this is not a NotificationCompat builder so be mindful of the
+        // API level of methods you call on the builder.
+        Notification.Builder builder = new Notification.Builder(mContext);
         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 +31,10 @@ public Notification build() {
         builder.setContentIntent(mContentIntent);
         builder.setDeleteIntent(mDeleteIntent);
         for (Action action : mActions) {
-            builder.addAction(action);
+            addActionToBuilder(builder, action);
         }
         if (mSettingsAction != null) {
-            builder.addAction(mSettingsAction);
+            addActionToBuilder(builder, mSettingsAction);
         }
         builder.setDefaults(mDefaults);
         builder.setVibrate(mVibratePattern);