Use NotificationResources instead of a bare SkBitmap.

content/shell/browser/layout_test/layout_test_notification_manager.h

 // 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.
 
 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_NOTIFICATION_MANAGER_H_
 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_NOTIFICATION_MANAGER_H_
 
 #include <stdint.h>
 #include <map>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/platform_notification_service.h"
 #include "third_party/WebKit/public/platform/modules/notifications/WebNotificationPermission.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class DesktopNotificationDelegate;
+struct NotificationResources;
 struct PlatformNotificationData;
 
 // Responsible for tracking active notifications and allowed origins for the
 // Web Notification API when running layout tests.
 class LayoutTestNotificationManager : public PlatformNotificationService {
  public:
   LayoutTestNotificationManager();
   ~LayoutTestNotificationManager() override;
 
   // Simulates a click on the notification titled |title|. |action_index|
   // indicates which action was clicked, or -1 if the main notification body was
   // clicked. Must be called on the UI thread.
   void SimulateClick(const std::string& title, int action_index);
 
   // PlatformNotificationService implementation.
   blink::WebNotificationPermission CheckPermissionOnUIThread(
       BrowserContext* browser_context,
       const GURL& origin,
       int render_process_id) override;
   blink::WebNotificationPermission CheckPermissionOnIOThread(
       ResourceContext* resource_context,
       const GURL& origin,
       int render_process_id) override;
   void 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) override;
   void DisplayPersistentNotification(
       BrowserContext* browser_context,
       int64_t persistent_notification_id,
       const GURL& origin,
-      const SkBitmap& icon,
-      const PlatformNotificationData& notification_data) override;
+      const PlatformNotificationData& notification_data,
+      const NotificationResources& notification_resources) override;
   void ClosePersistentNotification(
       BrowserContext* browser_context,
       int64_t persistent_notification_id) override;
   bool GetDisplayedPersistentNotifications(
       BrowserContext* browser_context,
       std::set<std::string>* displayed_notifications) override;
 
  private:
   // Structure to represent the information of a persistent notification.
   struct PersistentNotification {
@@ skipping 21 matching lines @@
   std::map<std::string, std::string> replacements_;
 
   base::WeakPtrFactory<LayoutTestNotificationManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LayoutTestNotificationManager);
 };
 
 }  // content
 
 #endif  // CONTENT_SHELL_BROWSER_LAYOUT_TEST_LAYOUT_TEST_NOTIFICATION_MANAGER_H_