Fixed Windows system tray icon.

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

 // Copyright (c) 2012 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/ui/views/status_icons/status_tray_win.h"
 
 #include <commctrl.h>
 
 #include "base/strings/string_util.h"

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

Remove

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

Done.

 #include "base/strings/utf_string_conversions.h"
 #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:
   FakeStatusTrayStateChangerProxy()
       : enqueue_called_(false), icon_id_(0), window_(NULL) {}
 
   void EnqueueChange(UINT icon_id, HWND window) override {
     enqueue_called_ = true;
     icon_id_ = icon_id;
     window_ = window;
@@ skipping 20 matching lines @@
   bool balloon_clicked() const { return balloon_clicked_; }
   size_t status_icon_click_count() const {
     return status_icon_click_count_;
   }
 
  private:
   size_t status_icon_click_count_;
   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;
 }
 
 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());
 }
 
 #if !defined(USE_AURA)  // http://crbug.com/156370
 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.
   tray.WndProc(NULL, icon->message_id(), icon->icon_id(), WM_LBUTTONDOWN);
   // Mimic a right-click - observer should not be called.
   tray.WndProc(NULL, icon->message_id(), icon->icon_id(), WM_RBUTTONDOWN);
   EXPECT_EQ(1, observer.status_icon_click_count());
   icon->RemoveObserver(&observer);
 }
 
 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.
   tray.WndProc(
       NULL, icon->message_id(), icon->icon_id(), TB_INDETERMINATE);
   EXPECT_TRUE(observer.balloon_clicked());
   icon->RemoveObserver(&observer);
 }
 
 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();
 
   tray.RemoveStatusIcon(icon);
   tray.WndProc(NULL, message_id, icon_id, WM_LBUTTONDOWN);
 }
 #endif  // !defined(USE_AURA)
 
 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,
   // so calling methods on |proxy| is safe.
   EXPECT_TRUE(proxy->enqueue_called());
   EXPECT_EQ(proxy->window(), icon->window());
   EXPECT_EQ(proxy->icon_id(), icon->icon_id());
 }