Fixed Windows system tray icon.

chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc

Index: chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
diff --git a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
index 443fb404761474f87d234c6eac9525510cb2794f..513cde613a09621f3012a354dde53792fd72dd84 100644
--- a/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
+++ b/chrome/browser/ui/views/status_icons/status_tray_win_unittest.cc
@@ -11,10 +11,11 @@
 #include "chrome/browser/status_icons/status_icon_menu_model.h"
 #include "chrome/browser/status_icons/status_icon_observer.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
-#include "grit/chrome_unscaled_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_unittest_util.h"
+
+namespace {
 
 class FakeStatusTrayStateChangerProxy : public StatusTrayStateChangerProxy {
  public:
@@ -55,6 +56,14 @@ class FakeStatusIconObserver : public StatusIconObserver {
   bool balloon_clicked_;
 };
 
+StatusIcon* CreateStatusIcon(StatusTray* tray) {
+  gfx::ImageSkia image = gfx::test::CreateImageSkia(16, 16);

[msw, 2015/11/12 00:43:29]

ditto: inline

[Matt Giuca, 2015/11/12 04:44:39]

Done.

+  return tray->CreateStatusIcon(
+      StatusTray::OTHER_ICON, image, base::ASCIIToUTF16("tool tip"));

[msw, 2015/11/12 00:43:29]

ditto: string16(), remove utf_string_conversions.h

[Matt Giuca, 2015/11/12 04:44:39]

Done.

+}
+
+}  // namespace
+
 TEST(StatusTrayWinTest, CreateTray) {
   // Just tests creation/destruction.
   StatusTrayWin tray;
@@ -64,10 +73,7 @@ TEST(StatusTrayWinTest, CreateIconAndMenu) {
   // Create an icon, set the images, tooltip, and context menu, then shut it
   // down.
   StatusTrayWin tray;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
-  StatusIcon* icon = tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));
+  StatusIcon* icon = CreateStatusIcon(&tray);
   scoped_ptr<StatusIconMenuModel> menu(new StatusIconMenuModel(NULL));
   menu->AddItem(0, L"foo");
   icon->SetContextMenu(menu.Pass());
@@ -77,11 +83,8 @@ TEST(StatusTrayWinTest, CreateIconAndMenu) {
 TEST(StatusTrayWinTest, ClickOnIcon) {
   // Create an icon, send a fake click event, make sure observer is called.
   StatusTrayWin tray;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
 
-  StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
+  StatusIconWin* icon = static_cast<StatusIconWin*>(CreateStatusIcon(&tray));

[msw, 2015/11/12 00:43:29]

nit: maybe include the static_cast in the helper and return StatusIconWin*?

[Matt Giuca, 2015/11/12 04:44:39]

Done.

   FakeStatusIconObserver observer;
   icon->AddObserver(&observer);
   // Mimic a click.
@@ -95,11 +98,7 @@ TEST(StatusTrayWinTest, ClickOnIcon) {
 TEST(StatusTrayWinTest, ClickOnBalloon) {
   // Create an icon, send a fake click event, make sure observer is called.
   StatusTrayWin tray;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
-
-  StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
+  StatusIconWin* icon = static_cast<StatusIconWin*>(CreateStatusIcon(&tray));
   FakeStatusIconObserver observer;
   icon->AddObserver(&observer);
   // Mimic a click.
@@ -111,11 +110,7 @@ TEST(StatusTrayWinTest, ClickOnBalloon) {
 
 TEST(StatusTrayWinTest, HandleOldIconId) {
   StatusTrayWin tray;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
-
-  StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
+  StatusIconWin* icon = static_cast<StatusIconWin*>(CreateStatusIcon(&tray));
   UINT message_id = icon->message_id();
   UINT icon_id = icon->icon_id();
 
@@ -126,16 +121,13 @@ TEST(StatusTrayWinTest, HandleOldIconId) {
 
 TEST(StatusTrayWinTest, EnsureVisibleTest) {
   StatusTrayWin tray;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
 
   FakeStatusTrayStateChangerProxy* proxy =
       new FakeStatusTrayStateChangerProxy();
   tray.SetStatusTrayStateChangerProxyForTest(
       scoped_ptr<StatusTrayStateChangerProxy>(proxy));
 
-  StatusIconWin* icon = static_cast<StatusIconWin*>(tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip")));
+  StatusIconWin* icon = static_cast<StatusIconWin*>(CreateStatusIcon(&tray));
 
   icon->ForceVisible();
   // |proxy| is owned by |tray|, and |tray| lives to the end of the scope,