Nuke NotificationUIManager from PlatformNotificationServiceImpl

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

Index: chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java
index c7665997e2de3934b4e53ef3239a2a1d5ed0a5b7..248519448d386a60b9a37e7f3ddc578c6a6f492c 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java
@@ -94,7 +94,7 @@ public class NotificationUIManager {
     @CalledByNative
     private static NotificationUIManager create(long nativeNotificationManager, Context context) {
         if (sInstance != null) {
-            throw new IllegalStateException("There must only be a single NotificationUIManager.");
+            throw new IllegalStateException("There must only be a single NotificationBridge.");
         }
 
         sInstance = new NotificationUIManager(nativeNotificationManager, context);
@@ -636,12 +636,15 @@ public class NotificationUIManager {
     /**
      * Closes the notification associated with the given parameters.
      *
+     * @param profileId of the profile whose notification this is for.
      * @param persistentNotificationId The persistent id of the notification.
      * @param origin The origin to which the notification belongs.
      * @param tag The tag of the notification. May be NULL.
      */
     @CalledByNative
-    private void closeNotification(long persistentNotificationId, String origin, String tag) {
+    private void closeNotification(
+            String profileId, long persistentNotificationId, String origin, String tag) {
+        // TODO(miguelg) make profile_id part of the tag.
         String platformTag = makePlatformTag(persistentNotificationId, origin, tag);
         mNotificationManager.cancel(platformTag, PLATFORM_ID);
     }