Switch notifications to use the security origin.

BUG=94399
TEST=browser_tests --gtest_filter=ExtensionApiTest.Notification*

Review URL: http://codereview.chromium.org/8480009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108726 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 13 insertions, 0 deletions

diff --git a/content/renderer/notification_provider.cc b/content/renderer/notification_provider.cc
index ffde3b9..54e1fdf 100644
--- a/content/renderer/notification_provider.cc
+++ b/content/renderer/notification_provider.cc
@@ -57,6 +57,16 @@ void NotificationProvider::objectDestroyed(
 }
 
 WebNotificationPresenter::Permission NotificationProvider::checkPermission(
+    const WebSecurityOrigin& origin) {
+  int permission;
+  Send(new DesktopNotificationHostMsg_CheckPermission(
+          routing_id(),
+          GURL(origin.toString()),
+          &permission));
+  return static_cast<WebNotificationPresenter::Permission>(permission);
+}
+
+WebNotificationPresenter::Permission NotificationProvider::checkPermission(
     const WebURL& origin) {
   int permission;
   Send(new DesktopNotificationHostMsg_CheckPermission(
diff --git a/content/renderer/notification_provider.h b/content/renderer/notification_provider.h
index 2d7188e..6664388 100644
--- a/content/renderer/notification_provider.h
+++ b/content/renderer/notification_provider.h
@@ -34,6 +34,9 @@ class NotificationProvider : public content::RenderViewObserver,
   virtual void cancel(const WebKit::WebNotification& proxy);
   virtual void objectDestroyed(const WebKit::WebNotification& proxy);
   virtual WebKit::WebNotificationPresenter::Permission checkPermission(
+      const WebKit::WebSecurityOrigin& origin);
+  // Deprecated, and will be removed after the WebKit roll.
+  virtual WebKit::WebNotificationPresenter::Permission checkPermission(
       const WebKit::WebURL& origin);
   virtual void requestPermission(const WebKit::WebSecurityOrigin& origin,
       WebKit::WebNotificationPermissionCallback* callback);