Start pulling away notification logic from ChromeContentBrowserClient.

content/browser/notifications/notification_message_filter.cc

 // 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.
 
 #include "content/browser/notifications/notification_message_filter.h"
 
 #include "base/callback.h"
 #include "content/browser/notifications/page_notification_delegate.h"
 #include "content/common/platform_notification_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/desktop_notification_delegate.h"
+#include "content/public/browser/platform_notification_service.h"
 #include "content/public/common/content_client.h"
 
 namespace content {
 
 NotificationMessageFilter::NotificationMessageFilter(
     int process_id,
     ResourceContext* resource_context,
     BrowserContext* browser_context)
     : BrowserMessageFilter(PlatformNotificationMsgStart),
       process_id_(process_id),
@@ skipping 29 matching lines @@
     const IPC::Message& message, content::BrowserThread::ID* thread) {
   if (message.type() == PlatformNotificationHostMsg_Show::ID ||
       message.type() == PlatformNotificationHostMsg_ShowPersistent::ID ||
       message.type() == PlatformNotificationHostMsg_Close::ID ||
       message.type() == PlatformNotificationHostMsg_ClosePersistent::ID)
     *thread = BrowserThread::UI;
 }
 
 void NotificationMessageFilter::OnCheckNotificationPermission(
     const GURL& origin, blink::WebNotificationPermission* permission) {
-  *permission =
-      GetContentClient()->browser()->CheckDesktopNotificationPermission(
-          origin,
-          resource_context_,
-          process_id_);
+  PlatformNotificationService* service =
+      GetContentClient()->browser()->GetPlatformNotificationService();
+  if (service) {
+    *permission = service->CheckPermission(resource_context_,
+                                           origin,
+                                           process_id_);
+  } else {
+    *permission = blink::WebNotificationPermissionDenied;
+  }
 }
 
 void NotificationMessageFilter::OnShowPlatformNotification(
     int notification_id, const ShowDesktopNotificationHostMsgParams& params) {
   scoped_ptr<DesktopNotificationDelegate> delegate(
       new PageNotificationDelegate(process_id_, notification_id));
 
   base::Closure close_closure;
-  GetContentClient()->browser()->ShowDesktopNotification(params,
-                                                         browser_context_,
-                                                         process_id_,
-                                                         delegate.Pass(),
-                                                         &close_closure);
+  PlatformNotificationService* service =
+      GetContentClient()->browser()->GetPlatformNotificationService();
+  DCHECK(service);
+
+  service->DisplayNotification(browser_context_,
+                               params,
+                               delegate.Pass(),
+                               process_id_,
+                               &close_closure);
 
   if (!close_closure.is_null())
     close_closures_[notification_id] = close_closure;
 }
 
 void NotificationMessageFilter::OnShowPersistentNotification(
     int request_id,
     int64 service_worker_registration_id,
     const ShowDesktopNotificationHostMsgParams& params) {
   NOTIMPLEMENTED();
@@ skipping 11 matching lines @@
   close_closures_[notification_id].Run();
   close_closures_.erase(notification_id);
 }
 
 void NotificationMessageFilter::OnClosePersistentNotification(
     const std::string& persistent_notification_id) {
   NOTIMPLEMENTED();
 }
 
 }  // namespace content