lacros: Stop sending deprecated notification image fields

Ash stopped handling these fields in M87. Going forward, all Lacros
releases will target M87 beta or later (M87 beta + M88 dev/canary).
Therefore Lacros can stop sending these fields.

Clean up SkBitmapFromBitmap utility function, since it is no longer
used. We can't clean up BitmapFromSkBitmap yet, since it's still used
by ScreenManager.

Bug: 1123969
Test: lacros unit_tests
Test: trigger notifications using Notifications Galore test app
Change-Id: I631d1d955cdbe6c34cfecf00d701eec57c9455dc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2466491Reviewed-by: Jun Mukai <mukai@chromium.org>
Commit-Queue: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816392}

chrome/browser/notifications/notification_platform_bridge_lacros.cc

@@ -12,8 +12,6 @@
 #include "base/numerics/safe_conversions.h"
 #include "base/optional.h"
 #include "chrome/browser/notifications/notification_platform_bridge_delegate.h"
-#include "chromeos/crosapi/cpp/bitmap.h"
-#include "chromeos/crosapi/cpp/bitmap_util.h"
 #include "chromeos/crosapi/mojom/message_center.mojom.h"
 #include "chromeos/crosapi/mojom/notification.mojom.h"
 #include "ui/message_center/public/cpp/notification.h"
@@ -59,30 +57,15 @@ crosapi::mojom::NotificationPtr ToMojo(
   mojo_note->message = notification.message();
   mojo_note->display_source = notification.display_source();
   mojo_note->origin_url = notification.origin_url();
-  if (!notification.icon().IsEmpty()) {
-    // TODO(https://crbug.com/1123969): Don't send the deprecated field after
-    // ash M87 beta.
-    SkBitmap icon = notification.icon().AsBitmap();
-    mojo_note->deprecated_icon = crosapi::BitmapFromSkBitmap(icon);
+  if (!notification.icon().IsEmpty())
     mojo_note->icon = notification.icon().AsImageSkia();
-  }
   mojo_note->priority = base::ClampToRange(notification.priority(), -2, 2);
   mojo_note->require_interaction = notification.never_timeout();
   mojo_note->timestamp = notification.timestamp();
-  if (!notification.image().IsEmpty()) {
-    // TODO(https://crbug.com/1123969): Don't send the deprecated field after
-    // ash M87 beta.
-    SkBitmap image = notification.image().AsBitmap();
-    mojo_note->deprecated_image = crosapi::BitmapFromSkBitmap(image);
+  if (!notification.image().IsEmpty())
     mojo_note->image = notification.image().AsImageSkia();
-  }
-  if (!notification.small_image().IsEmpty()) {
-    // TODO(https://crbug.com/1123969): Don't send the deprecated field after
-    // ash M87 beta.
-    SkBitmap badge = notification.small_image().AsBitmap();
-    mojo_note->deprecated_badge = crosapi::BitmapFromSkBitmap(badge);
+  if (!notification.small_image().IsEmpty())
     mojo_note->badge = notification.small_image().AsImageSkia();
-  }
   for (const auto& item : notification.items()) {
     auto mojo_item = crosapi::mojom::NotificationItem::New();
     mojo_item->title = item.title;

chrome/browser/notifications/notification_platform_bridge_lacros_unittest.cc

@@ -7,8 +7,6 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/notification_platform_bridge_delegate.h"
-#include "chromeos/crosapi/cpp/bitmap.h"
-#include "chromeos/crosapi/cpp/bitmap_util.h"
 #include "chromeos/crosapi/mojom/message_center.mojom.h"
 #include "chromeos/crosapi/mojom/notification.mojom.h"
 #include "content/public/test/browser_task_environment.h"
@@ -178,17 +176,6 @@ TEST_F(NotificationPlatformBridgeLacrosTest, SerializationSimple) {
   EXPECT_EQ(crosapi::mojom::FullscreenVisibility::kOverUser,
             last_notification->fullscreen_visibility);
 
-  // TODO(https://crbug.com/1123969): Don't test the deprecated field after
-  // ash M87 beta.
-  ASSERT_TRUE(last_notification->deprecated_badge.has_value());
-  EXPECT_TRUE(AreBitmapsEqual(
-      badge.AsBitmap(),
-      crosapi::SkBitmapFromBitmap(*last_notification->deprecated_badge)));
-  ASSERT_TRUE(last_notification->deprecated_icon.has_value());
-  EXPECT_TRUE(AreBitmapsEqual(
-      icon.AsBitmap(),
-      crosapi::SkBitmapFromBitmap(*last_notification->deprecated_icon)));
-
   ASSERT_FALSE(last_notification->badge.isNull());
   EXPECT_TRUE(last_notification->badge.HasRepresentation(1.0f));
   EXPECT_TRUE(last_notification->badge.HasRepresentation(2.0f));
@@ -223,12 +210,6 @@ TEST_F(NotificationPlatformBridgeLacrosTest, SerializationImage) {
   crosapi::mojom::Notification* last_notification =
       test_message_center_.last_notification_.get();
   ASSERT_TRUE(last_notification);
-  // TODO(https://crbug.com/1123969): Don't test the deprecated field after
-  // ash M87 beta.
-  ASSERT_TRUE(last_notification->deprecated_image.has_value());
-  EXPECT_TRUE(AreBitmapsEqual(
-      image.AsBitmap(),
-      crosapi::SkBitmapFromBitmap(*last_notification->deprecated_image)));
   ASSERT_FALSE(last_notification->image.isNull());
   EXPECT_TRUE(AreImagesEqual(image, gfx::Image(last_notification->image)));
 }

chromeos/crosapi/cpp/bitmap_util.cc

@@ -4,16 +4,13 @@
 
 #include "chromeos/crosapi/cpp/bitmap_util.h"
 
-#include <algorithm>
 #include <vector>
 
-#include "base/check.h"
 #include "base/check_op.h"
 #include "base/numerics/checked_math.h"
 #include "base/numerics/safe_conversions.h"
 #include "chromeos/crosapi/cpp/bitmap.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/skia/include/core/SkImageInfo.h"
 
 namespace crosapi {
 
@@ -33,17 +30,4 @@ Bitmap BitmapFromSkBitmap(const SkBitmap& sk_bitmap) {
   return snapshot;
 }
 
-SkBitmap SkBitmapFromBitmap(const Bitmap& snapshot) {
-  SkImageInfo info =
-      SkImageInfo::Make(snapshot.width, snapshot.height, kBGRA_8888_SkColorType,
-                        kPremul_SkAlphaType);
-  CHECK_EQ(info.computeByteSize(info.minRowBytes()), snapshot.pixels.size());
-  SkBitmap sk_bitmap;
-  CHECK(sk_bitmap.tryAllocPixels(info));
-  std::copy(snapshot.pixels.begin(), snapshot.pixels.end(),
-            static_cast<uint8_t*>(sk_bitmap.getPixels()));
-  sk_bitmap.notifyPixelsChanged();
-  return sk_bitmap;
-}
-
 }  // namespace crosapi

chromeos/crosapi/cpp/bitmap_util.h

@@ -18,11 +18,6 @@ struct Bitmap;
 // invalid size (e.g. its size is not equal to width * height * 4).
 COMPONENT_EXPORT(CROSAPI) Bitmap BitmapFromSkBitmap(const SkBitmap& sk_bitmap);
 
-// Converts a crosapi::Bitmap to an SkBitmap. Assumes the bitmap is 8-bit
-// ARGB with premultiplied alpha.
-// TODO(https://crbug.com/1116652): Support more flexible image options.
-COMPONENT_EXPORT(CROSAPI) SkBitmap SkBitmapFromBitmap(const Bitmap& bitmap);
-
 }  // namespace crosapi
 
 #endif  // CHROMEOS_CROSAPI_CPP_BITMAP_UTIL_H_