Remove plumbing for showing HTML notifications from content/.

WebNotification::isHTML() has been returning false since late July when
we removed the Web Exposed entry point, so all of this is dead code. The
removal shipped in Chrome 30, so it's unlikely to return.

BUG=

Review URL: https://codereview.chromium.org/95223003

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

chrome/browser/notifications/desktop_notification_service.cc

@@ -494,17 +494,14 @@ bool DesktopNotificationService::ShowDesktopNotification(
                                   source == WorkerNotification);
 
   string16 display_source = DisplayNameForOriginInProcessId(origin, process_id);
-  if (params.is_html) {
-    ShowNotification(Notification(origin, params.contents_url, display_source,
-        params.replace_id, proxy));
-  } else {
-    Notification notification(origin, params.icon_url, params.title,
-        params.body, params.direction, display_source, params.replace_id,
-        proxy);
-    // The webkit notification doesn't timeout.
-    notification.set_never_timeout(true);
-    ShowNotification(notification);
-  }
+  Notification notification(origin, params.icon_url, params.title,
+      params.body, params.direction, display_source, params.replace_id,
+      proxy);
+
+  // The webkit notification doesn't timeout.
+  notification.set_never_timeout(true);
+
+  ShowNotification(notification);
   return true;
 }
 

chrome/browser/notifications/desktop_notifications_unittest.cc

@@ -145,7 +145,6 @@ DesktopNotificationsTest::StandardTestNotification() {
   content::ShowDesktopNotificationHostMsgParams params;
   params.notification_id = 0;
   params.origin = GURL("http://www.google.com");
-  params.is_html = false;
   params.icon_url = GURL("/icon.png");
   params.title = ASCIIToUTF16("Title");
   params.body = ASCIIToUTF16("Text");
@@ -163,11 +162,11 @@ TEST_F(DesktopNotificationsTest, TestShow) {
   base::MessageLoopForUI::current()->RunUntilIdle();
   EXPECT_EQ(1, balloon_collection_->count());
 
-  content::ShowDesktopNotificationHostMsgParams params2;
-  params2.origin = GURL("http://www.google.com");
-  params2.is_html = true;
-  params2.contents_url = GURL("http://www.google.com/notification.html");
+  content::ShowDesktopNotificationHostMsgParams params2 =
+      StandardTestNotification();
   params2.notification_id = 2;
+  params2.origin = GURL("http://www.google.com");
+  params2.body = ASCIIToUTF16("Text");
 
   EXPECT_TRUE(service_->ShowDesktopNotification(
       params2, 0, 0, DesktopNotificationService::PageNotification));
@@ -254,7 +253,6 @@ TEST_F(DesktopNotificationsTest, TestPositioning) {
 TEST_F(DesktopNotificationsTest, TestVariableSize) {
   content::ShowDesktopNotificationHostMsgParams params;
   params.origin = GURL("http://long.google.com");
-  params.is_html = false;
   params.icon_url = GURL("/icon.png");
   params.title = ASCIIToUTF16("Really Really Really Really Really Really "
                               "Really Really Really Really Really Really "

content/browser/renderer_host/render_view_host_impl.cc

@@ -2203,15 +2203,6 @@ void RenderViewHostImpl::OnRequestDesktopNotificationPermission(
 
 void RenderViewHostImpl::OnShowDesktopNotification(
     const ShowDesktopNotificationHostMsgParams& params) {
-  // Disallow HTML notifications from javascript: and file: schemes as this
-  // allows unwanted cross-domain access.
-  GURL url = params.contents_url;
-  if (params.is_html &&
-      (url.SchemeIs(kJavaScriptScheme) ||
-       url.SchemeIs(chrome::kFileScheme))) {
-    return;
-  }
-
   GetContentClient()->browser()->ShowDesktopNotification(
       params, GetProcess()->GetID(), GetRoutingID(), false);
 }

content/common/desktop_notification_messages.h

@@ -12,8 +12,6 @@
 
 IPC_STRUCT_TRAITS_BEGIN(content::ShowDesktopNotificationHostMsgParams)
   IPC_STRUCT_TRAITS_MEMBER(origin)
-  IPC_STRUCT_TRAITS_MEMBER(is_html)
-  IPC_STRUCT_TRAITS_MEMBER(contents_url)
   IPC_STRUCT_TRAITS_MEMBER(icon_url)
   IPC_STRUCT_TRAITS_MEMBER(title)
   IPC_STRUCT_TRAITS_MEMBER(body)

content/public/common/show_desktop_notification_params.cc

@@ -7,7 +7,7 @@
 namespace content {
 
 ShowDesktopNotificationHostMsgParams::ShowDesktopNotificationHostMsgParams()
-    : is_html(false), direction(blink::WebTextDirectionDefault),
+    : direction(blink::WebTextDirectionDefault),
       notification_id(0) {
 }
 

content/public/common/show_desktop_notification_params.h

@@ -19,12 +19,6 @@ struct CONTENT_EXPORT ShowDesktopNotificationHostMsgParams {
   // URL which is the origin that created this notification.
   GURL origin;
 
-  // True if this is HTML
-  bool is_html;
-
-  // URL which contains the HTML contents (if is_html is true), otherwise empty.
-  GURL contents_url;
-
   // Contents of the notification if is_html is false.
   GURL icon_url;
   string16 title;

content/renderer/notification_provider.cc

@@ -35,11 +35,18 @@ NotificationProvider::~NotificationProvider() {
 }
 
 bool NotificationProvider::show(const WebNotification& notification) {
+  WebDocument document = render_view()->GetWebView()->mainFrame()->document();
   int notification_id = manager_.RegisterNotification(notification);
-  if (notification.isHTML())
-    return ShowHTML(notification, notification_id);
-  else
-    return ShowText(notification, notification_id);
+
+  ShowDesktopNotificationHostMsgParams params;
+  params.origin = GURL(document.securityOrigin().toString());
+  params.icon_url = notification.iconURL();
+  params.title = notification.title();
+  params.body = notification.body();
+  params.direction = notification.direction();
+  params.notification_id = notification_id;
+  params.replace_id = notification.replaceId();
+  return Send(new DesktopNotificationHostMsg_Show(routing_id(), params));
 }
 
 void NotificationProvider::cancel(const WebNotification& notification) {
@@ -100,35 +107,6 @@ bool NotificationProvider::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-bool NotificationProvider::ShowHTML(const WebNotification& notification,
-                                    int id) {
-  DCHECK(notification.isHTML());
-  ShowDesktopNotificationHostMsgParams params;
-  WebDocument document = render_view()->GetWebView()->mainFrame()->document();
-  params.origin = GURL(document.securityOrigin().toString());
-  params.is_html = true;
-  params.contents_url = notification.url();
-  params.notification_id = id;
-  params.replace_id = notification.replaceId();
-  return Send(new DesktopNotificationHostMsg_Show(routing_id(), params));
-}
-
-bool NotificationProvider::ShowText(const WebNotification& notification,
-                                    int id) {
-  DCHECK(!notification.isHTML());
-  ShowDesktopNotificationHostMsgParams params;
-  params.is_html = false;
-  WebDocument document = render_view()->GetWebView()->mainFrame()->document();
-  params.origin = GURL(document.securityOrigin().toString());
-  params.icon_url = notification.iconURL();
-  params.title = notification.title();
-  params.body = notification.body();
-  params.direction = notification.direction();
-  params.notification_id = id;
-  params.replace_id = notification.replaceId();
-  return Send(new DesktopNotificationHostMsg_Show(routing_id(), params));
-}
-
 void NotificationProvider::OnDisplay(int id) {
   WebNotification notification;
   bool found = manager_.GetNotification(id, &notification);

content/renderer/notification_provider.h

@@ -38,10 +38,6 @@ class NotificationProvider : public RenderViewObserver,
   virtual void requestPermission(const blink::WebSecurityOrigin& origin,
       blink::WebNotificationPermissionCallback* callback);
 
-  // Internal methods used to show notifications.
-  bool ShowHTML(const blink::WebNotification& notification, int id);
-  bool ShowText(const blink::WebNotification& notification, int id);
-
   // IPC handlers.
   void OnDisplay(int id);
   void OnError(int id, const blink::WebString& message);