Fixed Windows system tray icon.

chrome/browser/status_icons/status_tray_unittest.cc

Index: chrome/browser/status_icons/status_tray_unittest.cc
diff --git a/chrome/browser/status_icons/status_tray_unittest.cc b/chrome/browser/status_icons/status_tray_unittest.cc
index 90f13299867181915606d1fca80d42d0b0667e09..3a621a1a4a9d1dc443ab0ec35929a2c5b3a7adcd 100644
--- a/chrome/browser/status_icons/status_tray_unittest.cc
+++ b/chrome/browser/status_icons/status_tray_unittest.cc
@@ -7,12 +7,13 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/status_icons/status_icon.h"
 #include "chrome/browser/status_icons/status_tray.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"
 #include "ui/message_center/notifier_settings.h"
 
+namespace {
+
 class MockStatusIcon : public StatusIcon {
   void SetImage(const gfx::ImageSkia& image) override {}
   void SetToolTip(const base::string16& tool_tip) override {}
@@ -35,23 +36,27 @@ class TestStatusTray : public StatusTray {
   const StatusIcons& GetStatusIconsForTest() const { return status_icons(); }
 };
 
+StatusIcon* CreateStatusIcon(StatusTray* tray) {
+  // Note: IDR_STATUS_TRAY_ICON is not available on Windows, so just create a

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

nit: consider "Just create a dummy icon image; the actual image is irrelevant
here."

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

Done.

+  // dummy icon image.
+  gfx::ImageSkia image = gfx::test::CreateImageSkia(16, 16);

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

nit: inline below?

[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]

nit: use a blank string16() and remove utf_string_conversions.h

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

Done.

+}
+
+}  // namespace
+
 TEST(StatusTrayTest, Create) {
   // Check for creation and leaks.
   TestStatusTray tray;
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::ImageSkia* image = rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON);
-  tray.CreateStatusIcon(
-      StatusTray::OTHER_ICON, *image, base::ASCIIToUTF16("tool tip"));
+  CreateStatusIcon(&tray);
   EXPECT_EQ(1U, tray.GetStatusIconsForTest().size());
 }
 
 // Make sure that removing an icon removes it from the list.
 TEST(StatusTrayTest, CreateRemove) {
   TestStatusTray 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);
   EXPECT_EQ(1U, tray.GetStatusIconsForTest().size());
   tray.RemoveStatusIcon(icon);
   EXPECT_EQ(0U, tray.GetStatusIconsForTest().size());