Combine shelf platform and windowed app types.

ash/common/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/common/test/test_shelf_delegate.h"
 
 #include <utility>
 
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/test/test_shelf_item_delegate.h"
@@ skipping 24 matching lines @@
   AddShelfItem(window, STATUS_CLOSED);
   ShelfID shelf_id = window->GetIntProperty(WmWindowProperty::SHELF_ID);
   AddShelfIDToAppIDMapping(shelf_id, app_id);
 }
 
 void TestShelfDelegate::AddShelfItem(WmWindow* window, ShelfItemStatus status) {
   ShelfItem item;
   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);
   window->AddObserver(this);
 
   model_->SetShelfItemDelegate(id,
                                base::MakeUnique<TestShelfItemDelegate>(window));
   window->SetIntProperty(WmWindowProperty::SHELF_ID, 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