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

Unified Diff: ui/app_list/views/search_result_page_view_unittest.cc

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: fix Created 4 years, 3 months 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 | « ui/app_list/views/search_result_list_view_unittest.cc ('k') | ui/base/models/list_model.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/search_result_page_view_unittest.cc
diff --git a/ui/app_list/views/search_result_page_view_unittest.cc b/ui/app_list/views/search_result_page_view_unittest.cc
index 827852fb392dcc01eef91ffdd166184764958b92..35e80802e9ee78c9eb51ca2492b755c6c368acfc 100644
--- a/ui/app_list/views/search_result_page_view_unittest.cc
+++ b/ui/app_list/views/search_result_page_view_unittest.cc
@@ -9,6 +9,7 @@
#include "base/command_line.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "ui/app_list/app_list_model.h"
#include "ui/app_list/app_list_switches.h"
#include "ui/app_list/test/app_list_test_view_delegate.h"
@@ -61,10 +62,11 @@ class SearchResultPageViewTest : public views::ViewsTestBase,
// the earlier groups have higher relevance, and therefore appear first).
relevance -= 1.0;
for (int i = 0; i < data.second; ++i) {
- TestSearchResult* result = new TestSearchResult();
+ std::unique_ptr<TestSearchResult> result =
+ base::MakeUnique<TestSearchResult>();
result->set_display_type(data.first);
result->set_relevance(relevance);
- results->Add(result);
+ results->Add(std::move(result));
}
}
@@ -220,18 +222,18 @@ TEST_F(SearchResultPageViewTest, ResultsSorted) {
TestSearchResult* tile_result = new TestSearchResult();
tile_result->set_display_type(SearchResult::DISPLAY_TILE);
tile_result->set_relevance(1.0);
- results->Add(tile_result);
+ results->Add(base::WrapUnique(tile_result));
{
TestSearchResult* list_result = new TestSearchResult();
list_result->set_display_type(SearchResult::DISPLAY_LIST);
list_result->set_relevance(0.5);
- results->Add(list_result);
+ results->Add(base::WrapUnique(list_result));
}
{
TestSearchResult* list_result = new TestSearchResult();
list_result->set_display_type(SearchResult::DISPLAY_LIST);
list_result->set_relevance(0.3);
- results->Add(list_result);
+ results->Add(base::WrapUnique(list_result));
}
// Adding results will schedule Update().
« no previous file with comments | « ui/app_list/views/search_result_list_view_unittest.cc ('k') | ui/base/models/list_model.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698