Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(639)

Unified Diff: ui/app_list/app_list_model_unittest.cc

Issue 53403005: Fix leaks in AppListModelTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/valgrind/memcheck/suppressions.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/app_list_model_unittest.cc
diff --git a/ui/app_list/app_list_model_unittest.cc b/ui/app_list/app_list_model_unittest.cc
index 01df3e200c625ecaf22a94be44387f5c41bc908a..12486a6d5e2f60d1d0e6e585116e4a87f9b7b442 100644
--- a/ui/app_list/app_list_model_unittest.cc
+++ b/ui/app_list/app_list_model_unittest.cc
@@ -277,7 +277,7 @@ TEST_F(AppListModelTest, AppOrder) {
}
TEST_F(AppListModelTest, FolderItem) {
- AppListFolderItem* folder = new AppListFolderItem("folder1");
+ scoped_ptr<AppListFolderItem> folder(new AppListFolderItem("folder1"));
const size_t num_folder_apps = 8;
const size_t num_observed_apps = 4;
for (int i = 0; static_cast<size_t>(i) < num_folder_apps; ++i) {
@@ -285,12 +285,13 @@ TEST_F(AppListModelTest, FolderItem) {
folder->item_list()->AddItem(model_.CreateItem(name, name));
}
// Check that items 0 and 3 are observed.
- EXPECT_TRUE(ItemObservedByFolder(folder, folder->item_list()->item_at(0)));
EXPECT_TRUE(ItemObservedByFolder(
- folder, folder->item_list()->item_at(num_observed_apps - 1)));
+ folder.get(), folder->item_list()->item_at(0)));
+ EXPECT_TRUE(ItemObservedByFolder(
+ folder.get(), folder->item_list()->item_at(num_observed_apps - 1)));
// Check that item 4 is not observed.
EXPECT_FALSE(ItemObservedByFolder(
- folder, folder->item_list()->item_at(num_observed_apps)));
+ folder.get(), folder->item_list()->item_at(num_observed_apps)));
folder->item_list()->MoveItem(num_observed_apps, 0);
// Confirm that everything was moved where expected.
EXPECT_EQ(model_.GetItemName(num_observed_apps),
@@ -300,12 +301,13 @@ TEST_F(AppListModelTest, FolderItem) {
EXPECT_EQ(model_.GetItemName(num_observed_apps - 1),
folder->item_list()->item_at(num_observed_apps)->id());
// Check that items 0 and 3 are observed.
- EXPECT_TRUE(ItemObservedByFolder(folder, folder->item_list()->item_at(0)));
EXPECT_TRUE(ItemObservedByFolder(
- folder, folder->item_list()->item_at(num_observed_apps - 1)));
+ folder.get(), folder->item_list()->item_at(0)));
+ EXPECT_TRUE(ItemObservedByFolder(
+ folder.get(), folder->item_list()->item_at(num_observed_apps - 1)));
// Check that item 4 is not observed.
EXPECT_FALSE(ItemObservedByFolder(
- folder, folder->item_list()->item_at(num_observed_apps)));
+ folder.get(), folder->item_list()->item_at(num_observed_apps)));
}
} // namespace app_list
« no previous file with comments | « tools/valgrind/memcheck/suppressions.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698