mash: Remove shelf util functions; use WmWindow properties.

ash/test/test_shelf_delegate.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/test/test_shelf_delegate.h"
 
 #include <utility>
 
+#include "ash/aura/wm_window_aura.h"
 #include "ash/common/shelf/shelf_model.h"
-#include "ash/shelf/shelf_util.h"
+#include "ash/common/wm_window_property.h"
 #include "ash/test/test_shelf_item_delegate.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 
 namespace ash {
 namespace test {
 
 TestShelfDelegate* TestShelfDelegate::instance_ = NULL;
 
 TestShelfDelegate::TestShelfDelegate(ShelfModel* model) : model_(model) {
   CHECK(!instance_);
   instance_ = this;
 }
 
 TestShelfDelegate::~TestShelfDelegate() {
   instance_ = NULL;
 }
 
 void TestShelfDelegate::AddShelfItem(aura::Window* window) {
   AddShelfItem(window, STATUS_CLOSED);
 }
 
 void TestShelfDelegate::AddShelfItem(aura::Window* window,
                                      const std::string& app_id) {
   AddShelfItem(window, STATUS_CLOSED);
-  AddShelfIDToAppIDMapping(GetShelfIDForWindow(window), app_id);
+  WmWindow* wm_window = WmWindowAura::Get(window);
+  ShelfID shelf_id = wm_window->GetIntProperty(WmWindowProperty::SHELF_ID);
+  AddShelfIDToAppIDMapping(shelf_id, app_id);
 }
 
 void TestShelfDelegate::AddShelfItem(aura::Window* window,
                                      ShelfItemStatus status) {
   ShelfItem item;
   if (window->type() == ui::wm::WINDOW_TYPE_PANEL)
     item.type = TYPE_APP_PANEL;
   else
     item.type = TYPE_PLATFORM_APP;
   ShelfID id = model_->next_id();
   item.status = status;
   model_->Add(item);
   window->AddObserver(this);
 
   std::unique_ptr<ShelfItemDelegate> delegate(
       new TestShelfItemDelegate(window));
   model_->SetShelfItemDelegate(id, std::move(delegate));
-  SetShelfIDForWindow(id, window);
+  WmWindowAura::Get(window)->SetIntProperty(WmWindowProperty::SHELF_ID, id);
 }
 
 void TestShelfDelegate::RemoveShelfItemForWindow(aura::Window* window) {
-  ShelfID shelf_id = GetShelfIDForWindow(window);
+  WmWindow* wm_window = WmWindowAura::Get(window);
+  ShelfID shelf_id = wm_window->GetIntProperty(WmWindowProperty::SHELF_ID);
   if (shelf_id == 0)
     return;
   int index = model_->ItemIndexByID(shelf_id);
   DCHECK_NE(-1, index);
   model_->RemoveItemAt(index);
   window->RemoveObserver(this);
   if (HasShelfIDToAppIDMapping(shelf_id)) {
     const std::string& app_id = GetAppIDForShelfID(shelf_id);
     if (IsAppPinned(app_id))
       UnpinAppWithID(app_id);
@@ skipping 66 matching lines @@
                                                  const std::string& app_id) {
   shelf_id_to_app_id_map_[shelf_id] = app_id;
 }
 
 void TestShelfDelegate::RemoveShelfIDToAppIDMapping(ShelfID shelf_id) {
   shelf_id_to_app_id_map_.erase(shelf_id);
 }
 
 }  // namespace test
 }  // namespace ash