Combine shelf platform and windowed app types.

ash/common/test/test_shelf_delegate.cc

Index: ash/common/test/test_shelf_delegate.cc
diff --git a/ash/common/test/test_shelf_delegate.cc b/ash/common/test/test_shelf_delegate.cc
index 36d711a6b070436c5be88c94555e1652f563ade8..0c166c4e497024fbc52e06e59d4b897ba6452e0d 100644
--- a/ash/common/test/test_shelf_delegate.cc
+++ b/ash/common/test/test_shelf_delegate.cc
@@ -42,7 +42,7 @@ void TestShelfDelegate::AddShelfItem(WmWindow* window, ShelfItemStatus status) {
   if (window->GetType() == ui::wm::WINDOW_TYPE_PANEL)
     item.type = TYPE_APP_PANEL;
   else
-    item.type = TYPE_PLATFORM_APP;
+    item.type = TYPE_APP;
   ShelfID id = model_->next_id();
   item.status = status;
   model_->Add(item);