Add additional CHECKs to AppListModel.

ui/app_list/app_list_model.cc

Index: ui/app_list/app_list_model.cc
diff --git a/ui/app_list/app_list_model.cc b/ui/app_list/app_list_model.cc
index 2d0f58f64500196d931c7badf513c7dd7f4a5843..581074024f3ced0f5e14876bc50ca961dab1a2b9 100644
--- a/ui/app_list/app_list_model.cc
+++ b/ui/app_list/app_list_model.cc
@@ -74,7 +74,7 @@ AppListItem* AppListModel::AddItemToFolder(scoped_ptr<AppListItem> item,
   if (folder_id.empty())
     return AddItem(item.Pass());
   DVLOG(2) << "AddItemToFolder: " << item->id() << ": " << folder_id;
-  DCHECK(!item->IsInFolder() || item->folder_id() == folder_id);
+  CHECK(item->folder_id() != folder_id);

[tapted, 2014/08/25 04:25:45]

nit: CHECK_NE?

[stevenjb, 2014/08/25 20:39:06]

Done.

   DCHECK(item->GetItemType() != AppListFolderItem::kItemType);
   AppListFolderItem* dest_folder = FindOrCreateFolderItem(folder_id);
   if (!dest_folder)
@@ -159,10 +159,12 @@ void AppListModel::MoveItemToFolder(AppListItem* item,
     return;
   AppListFolderItem* dest_folder = FindOrCreateFolderItem(folder_id);
   scoped_ptr<AppListItem> item_ptr = RemoveItem(item);
-  if (dest_folder)
+  if (dest_folder) {
+    CHECK(item->folder_id().empty());

[tapted, 2014/08/25 04:25:45]

nit: CHECK(!item->IsInFolder()) - may be marginally more readable/understandable
in a log

[stevenjb, 2014/08/25 20:39:06]

Done.

     AddItemToFolderItemAndNotify(dest_folder, item_ptr.Pass());
-  else
+  } else {
     AddItemToItemListAndNotifyUpdate(item_ptr.Pass());
+  }
 }
 
 bool AppListModel::MoveItemToFolderAt(AppListItem* item,
@@ -357,6 +359,7 @@ AppListItem* AppListModel::AddItemToItemListAndNotifyUpdate(
 AppListItem* AppListModel::AddItemToFolderItemAndNotify(
     AppListFolderItem* folder,
     scoped_ptr<AppListItem> item_ptr) {
+  CHECK(item_ptr->folder_id() != folder->id());

[tapted, 2014/08/25 04:25:45]

nit: CHECK_NE?

[stevenjb, 2014/08/25 20:39:06]

Done.

   AppListItem* item = folder->item_list()->AddItem(item_ptr.Pass());
   item->set_folder_id(folder->id());
   FOR_EACH_OBSERVER(AppListModelObserver,
@@ -377,7 +380,7 @@ scoped_ptr<AppListItem> AppListModel::RemoveItemFromFolder(
     AppListFolderItem* folder,
     AppListItem* item) {
   std::string folder_id = folder->id();
-  DCHECK_EQ(item->folder_id(), folder_id);
+  CHECK_EQ(item->folder_id(), folder_id);
   scoped_ptr<AppListItem> result = folder->item_list()->RemoveItem(item->id());
   result->set_folder_id("");
   if (folder->item_list()->item_count() == 0) {