After uninstall, remove last item in Launcher folder

ui/app_list/app_list_model_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 "ui/app_list/app_list_model.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 420 matching lines @@
 
   // Move item1 to a non-existant folder2 which should get created.
   model_.MoveItemToFolder(item1, "folder2");
   ASSERT_EQ(2u, model_.top_level_item_list()->item_count());
   ASSERT_EQ(1u, folder1->item_list()->item_count());
   EXPECT_EQ("folder2", item1->folder_id());
   AppListFolderItem* folder2 = model_.FindFolderItem("folder2");
   ASSERT_TRUE(folder2);
 }
 
+TEST_F(AppListModelFolderTest, UninstallFolderItems) {
+  AppListItem* item0 = model_.CreateAndAddItem("Item 0");
+  AppListItem* item1 = model_.CreateAndAddItem("Item 1");
+  AppListItem* item2 = model_.CreateAndAddItem("Item 2");
+  AppListFolderItem* folder1 = static_cast<AppListFolderItem*>(model_.AddItem(
+      new AppListFolderItem("folder1", AppListFolderItem::FOLDER_TYPE_NORMAL)));
+  EXPECT_EQ("Item 0,Item 1,Item 2,folder1", GetModelContents());
+
+  // Move all items to folder1.
+  model_.MoveItemToFolderAt(item0, folder1->id(), item0->position());
+  model_.MoveItemToFolderAt(item1, folder1->id(), item1->position());
+  model_.MoveItemToFolderAt(item2, folder1->id(), item2->position());
+  EXPECT_EQ("Item 0,Item 1,Item 2", GetItemListContents(folder1->item_list()));
+  EXPECT_EQ("folder1", GetModelContents());
+
+  // Delete Item 2 from folder.
+  model_.DeleteUninstalledItem("Item 2");
+  EXPECT_EQ("Item 0,Item 1", GetItemListContents(folder1->item_list()));
+  EXPECT_EQ("folder1", GetModelContents());
+
+  // Delete Item 1 from folder, should reparent Item 0 and delete folder1.
+  model_.DeleteUninstalledItem("Item 1");
+  EXPECT_EQ(nullptr, model_.FindItem("folder1"));
+  EXPECT_EQ("Item 0", GetModelContents());
+}
+
+TEST_F(AppListModelFolderTest, UninstallSingleItemFolderItem) {
+  AppListItem* item0 = model_.CreateAndAddItem("Item 0");
+  AppListFolderItem* folder1 = static_cast<AppListFolderItem*>(model_.AddItem(
+      new AppListFolderItem("folder1", AppListFolderItem::FOLDER_TYPE_NORMAL)));
+  EXPECT_EQ("Item 0,folder1", GetModelContents());
+
+  // Move item0 to folder1.
+  model_.MoveItemToFolderAt(item0, folder1->id(), item0->position());
+  EXPECT_EQ("Item 0", GetItemListContents(folder1->item_list()));
+  EXPECT_EQ("folder1", GetModelContents());
+
+  // Delete only item from folder, folder should also be removed.
+  model_.DeleteUninstalledItem("Item 0");
+  EXPECT_EQ(nullptr, model_.FindItem("folder1"));
+  EXPECT_EQ("", GetModelContents());
+}
+
 TEST_F(AppListModelFolderTest, FindItemInFolder) {
   AppListFolderItem* folder =
       new AppListFolderItem("folder1", AppListFolderItem::FOLDER_TYPE_NORMAL);
   EXPECT_TRUE(folder);
   model_.AddItem(folder);
   std::string folder_id = folder->id();
   AppListItem* item0 = new AppListItem("Item 0");
   model_.AddItemToFolder(item0, folder_id);
   AppListItem* found_item = model_.FindItem(item0->id());
   ASSERT_EQ(item0, found_item);
@@ skipping 49 matching lines @@
   model_.SetFoldersEnabled(false);
   ASSERT_FALSE(model_.FindFolderItem(folder_id));
   ASSERT_TRUE(model_.FindFolderItem(oem_folder_id));
   EXPECT_EQ("Item 0,Item 1,oem_folder", GetModelContents());
 
   // Ensure folder creation fails.
   EXPECT_EQ(std::string(), model_.MergeItems(item0->id(), item1->id()));
 }
 
 }  // namespace app_list