Fixed Windows system tray icon.

chrome/browser/status_icons/status_icon_menu_model_unittest.cc

 // Copyright 2013 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/status_icons/status_icon_menu_model.h"
 
 #include "base/compiler_specific.h"
 #include "base/strings/string_util.h"
 #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/accelerators/accelerator.h"
-#include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_unittest_util.h"
 
 using base::ASCIIToUTF16;
 
 class StatusIconMenuModelTest : public testing::Test,
                                 public StatusIconMenuModel::Observer {
  public:
   void SetUp() override {
     menu_.reset(new StatusIconMenuModel(NULL));
     menu_->AddObserver(this);
     changed_count_ = 0;
@@ skipping 36 matching lines @@
 
   // Menu state should have changed 7 times in this test.
   EXPECT_EQ(7, changed_count());
 }
 
 TEST_F(StatusIconMenuModelTest, SetProperties) {
   menu_model()->AddItem(0, ASCIIToUTF16("foo1"));
   menu_model()->AddItem(1, ASCIIToUTF16("foo2"));
 
   ui::Accelerator test_accel(ui::VKEY_A, ui::EF_NONE);
-  ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-  gfx::Image test_image1(*rb.GetImageSkiaNamed(IDR_STATUS_TRAY_ICON));
+  gfx::Image test_image1 = gfx::test::CreateImage(16, 16);
   ui::Accelerator accel_arg;
   gfx::Image image_arg;
 
   EXPECT_FALSE(menu_model()->GetAcceleratorForCommandId(0, &accel_arg));
   EXPECT_FALSE(menu_model()->GetIconForCommandId(0, &image_arg));
   EXPECT_FALSE(menu_model()->IsItemForCommandIdDynamic(0));
 
   // Set the accelerator and label for the first menu item.
   menu_model()->SetAcceleratorForCommandId(0, &test_accel);
   EXPECT_TRUE(menu_model()->GetAcceleratorForCommandId(0, &accel_arg));
@@ skipping 18 matching lines @@
 
   // Ensure changes to one menu item does not affect the other menu item.
   EXPECT_FALSE(menu_model()->GetAcceleratorForCommandId(1, &accel_arg));
   EXPECT_EQ(base::string16(), menu_model()->GetLabelForCommandId(1));
   EXPECT_EQ(base::string16(), menu_model()->GetSublabelForCommandId(0));
   EXPECT_FALSE(menu_model()->GetIconForCommandId(0, &image_arg));
 
   // Menu state should have changed 7 times in this test.
   EXPECT_EQ(7, changed_count());
 }