Integrate the notification database with the normal code path.

chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationService.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.IntentService;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 34 matching lines @@
     }
 
     /**
      * Called when a Notification has been interacted with by the user. If we can verify that
      * the Intent has a notification Id, start Chrome (if needed) on the UI thread.
      *
      * @param intent The intent containing the specific information.
      */
     @Override
     public void onHandleIntent(final Intent intent) {
-        if (!intent.hasExtra(NotificationConstants.EXTRA_NOTIFICATION_ID)) return;
+        if (!intent.hasExtra(NotificationConstants.EXTRA_PERSISTENT_NOTIFICATION_ID)
+                || !intent.hasExtra(NotificationConstants.EXTRA_NOTIFICATION_INFO_ORIGIN)
+                || !intent.hasExtra(NotificationConstants.EXTRA_NOTIFICATION_INFO_TAG)) {
+            return;
+        }
 
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 dispatchIntentOnUIThread(intent);
             }
         });
     }
 
     /**
@@ skipping 24 matching lines @@
 
             // TODO(peter): The native side needs to tell us when executing the event has
             // finished, so that we can forcefully stop the service.
 
         } catch (ProcessInitException e) {
             Log.e(TAG, "Unable to start the browser process.", e);
             System.exit(-1);
         }
     }
 }