Nuke NotificationUIManager from PlatformNotificationServiceImpl

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

 // Copyright 2014 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.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ skipping 77 matching lines @@
 
     /**
      * Creates a new instance of the NotificationUIManager.
      *
      * @param nativeNotificationManager Instance of the NotificationUIManagerAndroid class.
      * @param context Application context for this instance of Chrome.
      */
     @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 NotificationPlatformBridge.");
         }
 
         sInstance = new NotificationUIManager(nativeNotificationManager, context);
         return sInstance;
     }
 
     /**
      * Returns the current instance of the NotificationUIManager.
      *
      * @return The instance of the NotificationUIManager, if any.
@@ skipping 524 matching lines @@
      */
     public static boolean wasNotificationRecentlyClicked() {
         if (sInstance == null) return false;
         long now = System.currentTimeMillis();
         return now - sInstance.mLastNotificationClickMs < 5 * 1000;
     }
 
     /**
      * 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);
     }
 
     /**
      * Calls NotificationUIManagerAndroid::OnNotificationClicked in native code to indicate that
      * the notification with the given parameters has been clicked on.
      *
      * @param persistentNotificationId The persistent id of the notification.
      * @param origin The origin of the notification.
@@ skipping 27 matching lines @@
 
     private static native void nativeInitializeNotificationUIManager();
 
     private native void nativeOnNotificationClicked(long nativeNotificationUIManagerAndroid,
             long persistentNotificationId, String origin, String profileId, boolean incognito,
             String tag, int actionIndex);
     private native void nativeOnNotificationClosed(long nativeNotificationUIManagerAndroid,
             long persistentNotificationId, String origin, String profileId, boolean incognito,
             String tag, boolean byUser);
 }