Replace IDR window property use with gfx::ImageSkia icons.

ash/common/shelf/shelf_window_watcher_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 "ash/common/shelf/shelf_window_watcher.h"
 
 #include "ash/common/shelf/shelf_item_types.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/wm/window_resizer.h"
 #include "ash/common/wm/window_state.h"
@@ skipping 87 matching lines @@
   EXPECT_EQ(STATUS_ACTIVE, model_->items()[index_w2].status);
 
   // ShelfItem is removed when the item type window property is cleared.
   window1->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);
   EXPECT_EQ(2, model_->item_count());
   window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);
   EXPECT_EQ(1, model_->item_count());
   // Clearing twice doesn't do anything.
   window2->SetIntProperty(WmWindowProperty::SHELF_ITEM_TYPE, TYPE_UNDEFINED);
   EXPECT_EQ(1, model_->item_count());
-
-  // Setting an icon id (without a valid item type) does not add a shelf item.
-  window2->SetIntProperty(WmWindowProperty::SHELF_ICON_RESOURCE_ID, 1234);
-  EXPECT_EQ(1, model_->item_count());
 }
 
 TEST_F(ShelfWindowWatcherTest, ActivateWindow) {
   // ShelfModel only have APP_LIST item.
   EXPECT_EQ(1, model_->item_count());
   std::unique_ptr<views::Widget> widget1 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
   WmWindow* window1 = WmLookup::Get()->GetWindowForWidget(widget1.get());
   std::unique_ptr<views::Widget> widget2 =
       CreateTestWidget(nullptr, kShellWindowId_DefaultContainer, gfx::Rect());
@@ skipping 183 matching lines @@
   // Each ShelfItem is removed when the associated window is destroyed.
   panel_widget.CloseNow();
   EXPECT_EQ(3, model_->item_count());
   widget2.reset();
   EXPECT_EQ(2, model_->item_count());
   widget1.reset();
   EXPECT_EQ(1, model_->item_count());
 }
 
 }  // namespace ash