Remove the notificationProvider extension API

chrome/browser/extensions/api/notifications/notifications_api.cc

Index: chrome/browser/extensions/api/notifications/notifications_api.cc
diff --git a/chrome/browser/extensions/api/notifications/notifications_api.cc b/chrome/browser/extensions/api/notifications/notifications_api.cc
index 44fc3e2126eaf6e632b084c2c04b8a913279def0..a79dc00d63d7a72f6adafe87da5a40fb875e2348 100644
--- a/chrome/browser/extensions/api/notifications/notifications_api.cc
+++ b/chrome/browser/extensions/api/notifications/notifications_api.cc
@@ -21,7 +21,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification.h"
-#include "chrome/browser/notifications/notification_conversion_helper.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/notifications/notifier_state_tracker.h"
 #include "chrome/browser/notifications/notifier_state_tracker_factory.h"
@@ -46,6 +45,7 @@
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_rep.h"
+#include "ui/gfx/skia_util.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/notifier_settings.h"
 #include "url/gurl.h"
@@ -125,6 +125,64 @@ const gfx::Image GetMaskedSmallImage(const gfx::ImageSkia& small_image) {
       background, masked_small_image));
 }
 
+bool NotificationBitmapToGfxImage(

[Devlin, 2017/01/28 02:45:03]

nit: add function level comment

[Peter Beverloo, 2017/02/09 16:03:10]

Done.

+    float max_scale,
+    const gfx::Size& target_size_dips,
+    const extensions::api::notifications::NotificationBitmap&

[Devlin, 2017/01/28 02:45:03]

s/extensions::api::notifications/notifications::

[Peter Beverloo, 2017/02/09 16:03:10]

Done.

+        notification_bitmap,
+    gfx::Image* return_image) {
+  const int max_device_pixel_width = target_size_dips.width() * max_scale;
+  const int max_device_pixel_height = target_size_dips.height() * max_scale;
+
+  const int BYTES_PER_PIXEL = 4;

[Devlin, 2017/01/28 02:45:03]

I think this was just copy-pasted, but since we're here, let's make this
kBytesPerPixel

[Peter Beverloo, 2017/02/09 16:03:10]

Done.

+
+  const int width = notification_bitmap.width;
+  const int height = notification_bitmap.height;
+
+  if (width < 0 || height < 0 || width > max_device_pixel_width ||
+      height > max_device_pixel_height)
+    return false;
+
+  // Ensure we have rgba data.
+  std::vector<char>* rgba_data = notification_bitmap.data.get();
+  if (!rgba_data)
+    return false;
+
+  const size_t rgba_data_length = rgba_data->size();
+  const size_t rgba_area = width * height;
+
+  if (rgba_data_length != rgba_area * BYTES_PER_PIXEL)
+    return false;
+
+  SkBitmap bitmap;
+  // Allocate the actual backing store with the sanitized dimensions.
+  if (!bitmap.tryAllocN32Pixels(width, height))
+    return false;
+
+  // Ensure that our bitmap and our data now refer to the same number of pixels.
+  if (rgba_data_length != bitmap.getSafeSize())
+    return false;
+
+  uint32_t* pixels = bitmap.getAddr32(0, 0);
+  const char* c_rgba_data = rgba_data->data();
+
+  for (size_t t = 0; t < rgba_area; ++t) {
+    // |c_rgba_data| is RGBA, pixels is ARGB.
+    size_t rgba_index = t * BYTES_PER_PIXEL;
+    pixels[t] =
+        SkPreMultiplyColor(((c_rgba_data[rgba_index + 3] & 0xFF) << 24) |
+                           ((c_rgba_data[rgba_index + 0] & 0xFF) << 16) |
+                           ((c_rgba_data[rgba_index + 1] & 0xFF) << 8) |
+                           ((c_rgba_data[rgba_index + 2] & 0xFF) << 0));
+  }
+
+  // TODO(dewittj): Handle HiDPI images with more than one scale factor
+  // representation.
+  gfx::ImageSkia skia(gfx::ImageSkiaRep(bitmap, 1.0f));
+  *return_image = gfx::Image(skia);
+  return true;
+}
+
 class ShutdownNotifierFactory
     : public BrowserContextKeyedServiceShutdownNotifierFactory {
  public:
@@ -322,7 +380,7 @@ bool NotificationsApiFunction::CreateNotification(
   gfx::Image icon;
 
   if (!options->icon_bitmap.get() ||
-      !NotificationConversionHelper::NotificationBitmapToGfxImage(
+      !NotificationBitmapToGfxImage(
           image_scale, bitmap_sizes.icon_size, *options->icon_bitmap, &icon)) {
     SetError(kUnableToDecodeIconError);
     return false;
@@ -332,7 +390,7 @@ bool NotificationsApiFunction::CreateNotification(
   message_center::RichNotificationData optional_fields;
   if (options->app_icon_mask_url.get()) {
     gfx::Image small_icon_mask;
-    if (!NotificationConversionHelper::NotificationBitmapToGfxImage(
+    if (!NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.app_icon_mask_size,
             *options->app_icon_mask_bitmap, &small_icon_mask)) {
       SetError(kUnableToDecodeIconError);
@@ -366,7 +424,7 @@ bool NotificationsApiFunction::CreateNotification(
       extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr =
           (*options->buttons)[i].icon_bitmap.get();
       if (icon_bitmap_ptr) {
-        NotificationConversionHelper::NotificationBitmapToGfxImage(
+        NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &info.icon);
       }
@@ -380,7 +438,7 @@ bool NotificationsApiFunction::CreateNotification(
   }
 
   bool has_image = options->image_bitmap.get() &&
-                   NotificationConversionHelper::NotificationBitmapToGfxImage(
+                   NotificationBitmapToGfxImage(
                        image_scale, bitmap_sizes.image_size,
                        *options->image_bitmap, &optional_fields.image);
 
@@ -467,7 +525,7 @@ bool NotificationsApiFunction::UpdateNotification(
 
   if (options->icon_bitmap.get()) {
     gfx::Image icon;
-    if (!NotificationConversionHelper::NotificationBitmapToGfxImage(
+    if (!NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.icon_size, *options->icon_bitmap,
             &icon)) {
       SetError(kUnableToDecodeIconError);
@@ -478,7 +536,7 @@ bool NotificationsApiFunction::UpdateNotification(
 
   if (options->app_icon_mask_bitmap.get()) {
     gfx::Image app_icon_mask;
-    if (!NotificationConversionHelper::NotificationBitmapToGfxImage(
+    if (!NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.app_icon_mask_size,
             *options->app_icon_mask_bitmap, &app_icon_mask)) {
       SetError(kUnableToDecodeIconError);
@@ -506,7 +564,7 @@ bool NotificationsApiFunction::UpdateNotification(
       extensions::api::notifications::NotificationBitmap* icon_bitmap_ptr =
           (*options->buttons)[i].icon_bitmap.get();
       if (icon_bitmap_ptr) {
-        NotificationConversionHelper::NotificationBitmapToGfxImage(
+        NotificationBitmapToGfxImage(
             image_scale, bitmap_sizes.button_icon_size, *icon_bitmap_ptr,
             &button.icon);
       }
@@ -523,7 +581,7 @@ bool NotificationsApiFunction::UpdateNotification(
   gfx::Image image;
   bool has_image =
       options->image_bitmap.get() &&
-      NotificationConversionHelper::NotificationBitmapToGfxImage(
+      NotificationBitmapToGfxImage(
           image_scale, bitmap_sizes.image_size, *options->image_bitmap, &image);
 
   if (has_image) {