Use NotificationResources instead of a bare SkBitmap.

content/shell/browser/layout_test/layout_test_notification_manager.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/shell/browser/layout_test/layout_test_notification_manager.h"
 
 #include "base/guid.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/desktop_notification_delegate.h"
@@ skipping 30 matching lines @@
 }  // namespace
 
 LayoutTestNotificationManager::LayoutTestNotificationManager()
     : weak_factory_(this) {}
 
 LayoutTestNotificationManager::~LayoutTestNotificationManager() {}
 
 void LayoutTestNotificationManager::DisplayNotification(
     BrowserContext* browser_context,
     const GURL& origin,
-    const SkBitmap& icon,
     const PlatformNotificationData& notification_data,
+    const NotificationResources& notification_resources,
     scoped_ptr<DesktopNotificationDelegate> delegate,
     base::Closure* cancel_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::string title = base::UTF16ToUTF8(notification_data.title);
 
   DCHECK(cancel_callback);
   *cancel_callback = base::Bind(&LayoutTestNotificationManager::Close,
                                 weak_factory_.GetWeakPtr(),
                                 title);
 
   ReplaceNotificationIfNeeded(notification_data);
 
   page_notifications_[title] = delegate.release();
   page_notifications_[title]->NotificationDisplayed();
 }
 
 void LayoutTestNotificationManager::DisplayPersistentNotification(
     BrowserContext* browser_context,
     int64_t persistent_notification_id,
     const GURL& origin,
-    const SkBitmap& icon,
-    const PlatformNotificationData& notification_data) {
+    const PlatformNotificationData& notification_data,
+    const NotificationResources& notification_resources) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::string title = base::UTF16ToUTF8(notification_data.title);
 
   ReplaceNotificationIfNeeded(notification_data);
 
   PersistentNotification notification;
   notification.browser_context = browser_context;
   notification.origin = origin;
   notification.persistent_id = persistent_notification_id;
 
@@ skipping 111 matching lines @@
 LayoutTestNotificationManager::CheckPermission(const GURL& origin) {
   return ToWebNotificationPermission(LayoutTestContentBrowserClient::Get()
       ->GetLayoutTestBrowserContext()
       ->GetLayoutTestPermissionManager()
       ->GetPermissionStatus(PermissionType::NOTIFICATIONS,
                             origin,
                             origin));
 }
 
 }  // namespace content