Notifications in sensitive contexts now display origin + small icon

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 fec668ac99dca204ddca52b976a67af99de4e52a..337b6f4805675d65db0dbdf06a8d639d72d75296 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
@@ -15,6 +15,7 @@ public class StandardNotificationBuilder extends NotificationBuilderBase {
     private final Context mContext;
 
     public StandardNotificationBuilder(Context context) {
+        super(context.getResources());
         mContext = context;
     }
 
@@ -41,7 +42,7 @@ public class StandardNotificationBuilder extends NotificationBuilderBase {
             // If there is no image, let the body text wrap only multiple lines when expanded.
             builder.setStyle(new Notification.BigTextStyle().bigText(mBody));
         }
-        builder.setLargeIcon(mLargeIcon);
+        builder.setLargeIcon(getNormalizedLargeIcon());
         setSmallIconOnBuilder(builder, mSmallIconId, mSmallIconBitmap);
         builder.setContentIntent(mContentIntent);
         builder.setDeleteIntent(mDeleteIntent);
@@ -55,6 +56,10 @@ public class StandardNotificationBuilder extends NotificationBuilderBase {
         builder.setVibrate(mVibratePattern);
         builder.setWhen(mTimestamp);
         builder.setOnlyAlertOnce(!mRenotify);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // Notification.Builder.setPublicVersion was added in Android L.
+            builder.setPublicVersion(createPublicNotification(mContext));
+        }
         return builder.build();
     }
 }