Notifications in sensitive contexts now display origin + small icon

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/StandardNotificationBuilderTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.notifications;
 
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.os.Build;
-import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.text.SpannableStringBuilder;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.R;
+import org.chromium.chrome.browser.util.UrlUtilities;
+import org.chromium.chrome.browser.widget.RoundedIconGenerator;
+import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 /**
  * Instrumentation unit tests for StandardNotificationBuilder.
+ *
+ * Extends NativeLibraryTestBase so that {@link UrlUtilities#getDomainAndRegistry} can access
+ * native GetDomainAndRegistry, when called by {@link RoundedIconGenerator#getIconTextForUrl} during
+ * notification construction.
  */
-public class StandardNotificationBuilderTest extends InstrumentationTestCase {
+public class StandardNotificationBuilderTest extends NativeLibraryTestBase {
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        // Not initializing the browser process is safe because GetDomainAndRegistry() is
+        // stand-alone.
+        loadNativeLibraryNoBrowserProcess();
+    }
+
     private NotificationBuilderBase createAllOptionsBuilder(
             PendingIntent[] outContentAndDeleteIntents) {
         if (outContentAndDeleteIntents == null || outContentAndDeleteIntents.length != 2)
             throw new IllegalArgumentException();
 
         Context context = getInstrumentation().getTargetContext();
 
         Intent contentIntent = new Intent("contentIntent");
         outContentAndDeleteIntents[0] = PendingIntent.getBroadcast(
                 context, 0 /* requestCode */, contentIntent, PendingIntent.FLAG_UPDATE_CURRENT);
@@ skipping 61 matching lines @@
         assertEquals(Notification.DEFAULT_ALL, notification.defaults);
         assertEquals(1, notification.vibrate.length);
         assertEquals(100L, notification.vibrate[0]);
         assertEquals(contentAndDeleteIntents[0], notification.contentIntent);
         assertEquals(contentAndDeleteIntents[1], notification.deleteIntent);
         Notification.Action[] actions = NotificationTestUtil.getActions(notification);
         assertEquals(3, actions.length);
         assertEquals("button 1", NotificationTestUtil.getActionTitle(actions[0]));
         assertEquals("button 2", NotificationTestUtil.getActionTitle(actions[1]));
         assertEquals("settings", NotificationTestUtil.getActionTitle(actions[2]));
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // Notification.publicVersion was added in Android L.
+            assertNotNull(notification.publicVersion);
+            assertEquals(context.getString(R.string.notification_hidden_text),
+                    NotificationTestUtil.getExtraText(notification.publicVersion));
+        }
+        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.M) {
+            assertEquals(
+                    "origin", NotificationTestUtil.getExtraSubText(notification.publicVersion));
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            assertEquals("origin", NotificationTestUtil.getExtraTitle(notification.publicVersion));
+        }
     }
 
     @SmallTest
     @Feature({"Browser", "Notifications"})
     public void testBigTextStyle() {
         PendingIntent[] contentAndDeleteIntents = new PendingIntent[2];
         NotificationBuilderBase builder = createAllOptionsBuilder(contentAndDeleteIntents);
         builder.setImage(null);
         Notification notification = builder.build();
 
@@ skipping 34 matching lines @@
             Notification otherNotification = otherBuilder.build();
             assertTrue(expected.sameAs(
                     NotificationTestUtil.getSmallIconFromNotification(context, otherNotification)));
         } else {
             Bitmap expected =
                     BitmapFactory.decodeResource(context.getResources(), R.drawable.ic_chrome);
             assertTrue(expected.sameAs(result));
         }
     }
 }