notifications: Add areNotificationsEnabled() to NotificationManagerProxy

This allows mocking of the NotificationManager in places where
areNotificationsEnabled() is called.

Added in preparation of the mobile tracing feature, which requires
mocking this method for tests.

TBR=mvanouwerkerk@chromium.org,nyquist@chromium.org

Bug: 898512
Change-Id: Ic739269858970a2365ae6772f269e0aff19d4f5c
Reviewed-on: https://chromium-review.googlesource.com/c/1321730Reviewed-by: Eric Seckler <eseckler@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Commit-Queue: Eric Seckler <eseckler@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606272}

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

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.notifications;
 
-import android.app.NotificationManager;
 import android.content.Context;
 
 import org.chromium.base.ContextUtils;
@@ -30,8 +29,8 @@ public class NotificationBuilderFactory {
             boolean preferCompat, String channelId) {
         Context context = ContextUtils.getApplicationContext();
 
-        NotificationManagerProxyImpl notificationManagerProxy = new NotificationManagerProxyImpl(
-                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE));
+        NotificationManagerProxyImpl notificationManagerProxy =
+                new NotificationManagerProxyImpl(context);
 
         ChannelsInitializer channelsInitializer =
                 new ChannelsInitializer(notificationManagerProxy, context.getResources());

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

@@ -20,6 +20,10 @@ import java.util.List;
  *     https://developer.android.com/reference/android/app/NotificationManager.html</a>
  */
 public interface NotificationManagerProxy {
+    // Implemented by NotificationManagerCompat and thus available on all API levels.
+    // Note that on < Kitkat, this always returns true.
+    boolean areNotificationsEnabled();
+
     void cancel(int id);
     void cancel(String tag, int id);
     void cancelAll();

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

@@ -9,7 +9,9 @@ import android.app.Notification;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
+import android.content.Context;
 import android.os.Build;
+import android.support.v4.app.NotificationManagerCompat;
 
 import java.util.List;
 
@@ -18,10 +20,18 @@ import java.util.List;
  * normal Android Notification Manager.
  */
 public class NotificationManagerProxyImpl implements NotificationManagerProxy {
+    private final Context mContext;
     private final NotificationManager mNotificationManager;
 
-    public NotificationManagerProxyImpl(NotificationManager notificationManager) {
-        mNotificationManager = notificationManager;
+    public NotificationManagerProxyImpl(Context context) {
+        mContext = context;
+        mNotificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+    }
+
+    @Override
+    public boolean areNotificationsEnabled() {
+        return NotificationManagerCompat.from(mContext).areNotificationsEnabled();
     }
 
     @Override

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

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.notifications;
 
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.app.RemoteInput;
 import android.content.Context;
@@ -130,8 +129,7 @@ public class NotificationPlatformBridge {
         if (sNotificationManagerOverride != null) {
             mNotificationManager = sNotificationManagerOverride;
         } else {
-            mNotificationManager = new NotificationManagerProxyImpl(
-                    (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE));
+            mNotificationManager = new NotificationManagerProxyImpl(context);
         }
         mTwaClient = new TrustedWebActivityClient(
                 new TrustedWebActivityServiceConnectionManager(context));

chrome/android/java/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdater.java

@@ -4,8 +4,6 @@
 
 package org.chromium.chrome.browser.notifications.channels;
 
-import android.app.NotificationManager;
-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Build;
 
@@ -35,10 +33,8 @@ public class ChannelsUpdater {
         public static final ChannelsUpdater INSTANCE = Build.VERSION.SDK_INT < Build.VERSION_CODES.O
                 ? new ChannelsUpdater(false /* isAtLeastO */, null, null, -1)
                 : new ChannelsUpdater(true /* isAtLeastO */, ContextUtils.getAppSharedPreferences(),
-                          new ChannelsInitializer(
-                                  new NotificationManagerProxyImpl(
-                                          (NotificationManager) ContextUtils.getApplicationContext()
-                                                  .getSystemService(Context.NOTIFICATION_SERVICE)),
+                          new ChannelsInitializer(new NotificationManagerProxyImpl(
+                                                          ContextUtils.getApplicationContext()),
                                   ContextUtils.getApplicationContext().getResources()),
                           ChannelDefinitions.CHANNELS_VERSION);
     }

chrome/android/java/src/org/chromium/chrome/browser/notifications/channels/SiteChannelsManager.java

@@ -8,7 +8,6 @@ import android.annotation.TargetApi;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.NotificationManager;
-import android.content.Context;
 import android.os.Build;
 import android.support.annotation.Nullable;
 
@@ -38,10 +37,8 @@ public class SiteChannelsManager {
     }
 
     private static class LazyHolder {
-        public static final SiteChannelsManager INSTANCE =
-                new SiteChannelsManager(new NotificationManagerProxyImpl(
-                        (NotificationManager) ContextUtils.getApplicationContext().getSystemService(
-                                Context.NOTIFICATION_SERVICE)));
+        public static final SiteChannelsManager INSTANCE = new SiteChannelsManager(
+                new NotificationManagerProxyImpl(ContextUtils.getApplicationContext()));
     }
 
     @VisibleForTesting

chrome/android/java/src/org/chromium/chrome/browser/ntp/ContentSuggestionsNotifier.java

@@ -457,9 +457,7 @@ public class ContentSuggestionsNotifier {
         if (prefs.getBoolean(PREF_CHANNEL_CREATED, false)) return false;
 
         ChannelsInitializer initializer = new ChannelsInitializer(
-                new NotificationManagerProxyImpl(
-                        (NotificationManager) ContextUtils.getApplicationContext().getSystemService(
-                                Context.NOTIFICATION_SERVICE)),
+                new NotificationManagerProxyImpl(ContextUtils.getApplicationContext()),
                 ContextUtils.getApplicationContext().getResources());
         if (enabled) {
             initializer.ensureInitialized(ChannelDefinitions.ChannelId.CONTENT_SUGGESTIONS);
@@ -482,9 +480,8 @@ public class ContentSuggestionsNotifier {
         SharedPreferences prefs = ContextUtils.getAppSharedPreferences();
         if (!prefs.getBoolean(PREF_CHANNEL_CREATED, false)) return;
 
-        NotificationManagerProxy manager = new NotificationManagerProxyImpl(
-                (NotificationManager) ContextUtils.getApplicationContext().getSystemService(
-                        Context.NOTIFICATION_SERVICE));
+        NotificationManagerProxy manager =
+                new NotificationManagerProxyImpl(ContextUtils.getApplicationContext());
         manager.deleteNotificationChannel(ChannelDefinitions.ChannelId.CONTENT_SUGGESTIONS);
         prefs.edit().remove(PREF_CHANNEL_CREATED).apply();
     }

chrome/android/java/src/org/chromium/chrome/browser/sync/SyncNotificationController.java

@@ -5,7 +5,6 @@
 package org.chromium.chrome.browser.sync;
 
 import android.app.Notification;
-import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.ComponentName;
 import android.content.Context;
@@ -40,9 +39,8 @@ public class SyncNotificationController implements ProfileSyncService.SyncStateC
     private final ProfileSyncService mProfileSyncService;
 
     public SyncNotificationController() {
-        mNotificationManager = new NotificationManagerProxyImpl(
-                (NotificationManager) ContextUtils.getApplicationContext().getSystemService(
-                        Context.NOTIFICATION_SERVICE));
+        mNotificationManager =
+                new NotificationManagerProxyImpl(ContextUtils.getApplicationContext());
         mProfileSyncService = ProfileSyncService.get();
         assert mProfileSyncService != null;
     }

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/channels/ChannelsInitializerTest.java

@@ -66,8 +66,7 @@ public class ChannelsInitializerTest {
         mNativeLibraryTestRule.loadNativeLibraryNoBrowserProcess();
 
         mContext = InstrumentationRegistry.getTargetContext();
-        mNotificationManagerProxy = new NotificationManagerProxyImpl(
-                (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE));
+        mNotificationManagerProxy = new NotificationManagerProxyImpl(mContext);
         mChannelsInitializer =
                 new ChannelsInitializer(mNotificationManagerProxy, mContext.getResources());
 

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/channels/ChannelsUpdaterTest.java

@@ -61,8 +61,7 @@ public class ChannelsUpdaterTest {
         mNativeLibraryTestRule.loadNativeLibraryNoBrowserProcess();
 
         Context context = InstrumentationRegistry.getTargetContext();
-        mNotificationManagerProxy = new NotificationManagerProxyImpl(
-                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE));
+        mNotificationManagerProxy = new NotificationManagerProxyImpl(context);
 
         mMockResources = context.getResources();
 

chrome/android/javatests/src/org/chromium/chrome/browser/notifications/channels/SiteChannelsManagerTest.java

@@ -10,7 +10,6 @@ import static org.hamcrest.Matchers.is;
 
 import android.annotation.TargetApi;
 import android.app.NotificationChannel;
-import android.app.NotificationManager;
 import android.content.Context;
 import android.os.Build;
 import android.support.test.InstrumentationRegistry;
@@ -62,8 +61,8 @@ public class SiteChannelsManagerTest {
         mChromeBrowserTestRule.loadNativeLibraryAndInitBrowserProcess();
 
         Context mContext = InstrumentationRegistry.getTargetContext();
-        NotificationManagerProxy notificationManagerProxy = new NotificationManagerProxyImpl(
-                (NotificationManager) mContext.getSystemService(Context.NOTIFICATION_SERVICE));
+        NotificationManagerProxy notificationManagerProxy =
+                new NotificationManagerProxyImpl(mContext);
         clearExistingSiteChannels(notificationManagerProxy);
         mSiteChannelsManager = new SiteChannelsManager(notificationManagerProxy);
     }

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/notifications/MockNotificationManagerProxy.java

@@ -46,6 +46,8 @@ public class MockNotificationManagerProxy implements NotificationManagerProxy {
 
     private int mMutationCount;
 
+    private boolean mNotificationsEnabled = true;
+
     public MockNotificationManagerProxy() {
         mNotifications = new LinkedHashMap<>();
         mMutationCount = 0;
@@ -76,6 +78,15 @@ public class MockNotificationManagerProxy implements NotificationManagerProxy {
         return mutationCount;
     }
 
+    public void setNotificationsEnabled(boolean enabled) {
+        mNotificationsEnabled = enabled;
+    }
+
+    @Override
+    public boolean areNotificationsEnabled() {
+        return mNotificationsEnabled;
+    }
+
     @Override
     public void cancel(int id) {
         cancel(null /* tag */, id);