Combine shelf platform and windowed app types.

ash/shelf/shelf_unittest.cc

Index: ash/shelf/shelf_unittest.cc
diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc
index bfb3d1eb629cc1b54e9937834c068502021fb60a..060018c6988521e5f0818d7087b48957caa9162b 100644
--- a/ash/shelf/shelf_unittest.cc
+++ b/ash/shelf/shelf_unittest.cc
@@ -46,9 +46,9 @@ TEST_F(ShelfTest, StatusReflection) {
   // Initially we have the app list.
   int button_count = test_api()->GetButtonCount();
 
-  // Add running platform app.
+  // Add a running app.
   ShelfItem item;
-  item.type = TYPE_PLATFORM_APP;
+  item.type = TYPE_APP;
   item.status = STATUS_RUNNING;
   int index = shelf_model()->Add(item);
   ASSERT_EQ(++button_count, test_api()->GetButtonCount());
@@ -66,9 +66,9 @@ TEST_F(ShelfTest, CheckHoverAfterMenu) {
   // Initially we have the app list.
   int button_count = test_api()->GetButtonCount();
 
-  // Add running platform app.
+  // Add a running app.
   ShelfItem item;
-  item.type = TYPE_PLATFORM_APP;
+  item.type = TYPE_APP;
   item.status = STATUS_RUNNING;
   int index = shelf_model()->Add(item);
 
@@ -91,11 +91,11 @@ TEST_F(ShelfTest, ShowOverflowBubble) {
   ShelfWidget* shelf_widget = GetPrimaryShelf()->shelf_widget();
   ShelfID first_item_id = shelf_model()->next_id();
 
-  // Add platform app button until overflow.
+  // Add app buttons until overflow occurs.
   int items_added = 0;
   while (!test_api()->IsOverflowButtonVisible()) {
     ShelfItem item;
-    item.type = TYPE_PLATFORM_APP;
+    item.type = TYPE_APP;
     item.status = STATUS_RUNNING;
     shelf_model()->Add(item);