Returning error when NotificationConversionHelper::NotificationBitmapToGfxImage() get failed in not…

chrome/browser/notifications/notification_conversion_helper.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 "chrome/browser/notifications/notification_conversion_helper.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 124 matching lines @@
                              vector_as_array(rgba_bitmap_data.get())));
   sk_bitmap.unlockPixels();
 
   notification_bitmap->data = rgba_bitmap_data.Pass();
   return;
 }
 
 bool NotificationConversionHelper::NotificationBitmapToGfxImage(
     float max_scale,
     const gfx::Size& target_size_dips,
-    extensions::api::notifications::NotificationBitmap* notification_bitmap,
+    const extensions::api::notifications::NotificationBitmap&
+        notification_bitmap,
     gfx::Image* return_image) {
-  if (!notification_bitmap)
-    return false;
-
   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;
 
-  const int width = notification_bitmap->width;
-  const int height = notification_bitmap->height;
+  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();
+  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;
@@ skipping 34 matching lines @@
       return "image";
     case message_center::NOTIFICATION_TYPE_MULTIPLE:
       return "list";
     case message_center::NOTIFICATION_TYPE_PROGRESS:
       return "progress";
     default:
       NOTREACHED();
       return "";
   }
 }