Fix object ownership in ui/base/models.

ui/app_list/views/search_result_page_view_unittest.cc

 // Copyright 2014 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/views/search_result_page_view.h"
 
 #include <utility>
 #include <vector>
 
 #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"
 #include "ui/app_list/test/test_search_result.h"
 #include "ui/app_list/views/search_result_list_view.h"
 #include "ui/app_list/views/search_result_list_view_delegate.h"
 #include "ui/app_list/views/search_result_tile_item_list_view.h"
 #include "ui/app_list/views/search_result_view.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/test/views_test_base.h"
@@ skipping 32 matching lines @@
   void SetUpSearchResults(const std::vector<
       std::pair<SearchResult::DisplayType, int>> result_types) {
     AppListModel::SearchResults* results = GetResults();
     results->DeleteAll();
     double relevance = result_types.size();
     for (const auto& data : result_types) {
       // Set the relevance of the results in each group in decreasing order (so
       // 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));
       }
     }
 
     // Adding results will schedule Update().
     RunPendingMessages();
   }
 
   int GetSelectedIndex() { return view_->selected_index(); }
 
   bool KeyPress(ui::KeyboardCode key_code) { return KeyPress(key_code, false); }
@@ skipping 135 matching lines @@
 }
 
 TEST_F(SearchResultPageViewTest, ResultsSorted) {
   AppListModel::SearchResults* results = GetResults();
 
   // Add 3 results and expect the tile list view to be the first result
   // container view.
   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().
   RunPendingMessages();
 
   EXPECT_EQ(tile_list_view(), view()->result_container_views()[0]);
   EXPECT_EQ(list_view(), view()->result_container_views()[1]);
 
   // Change the relevance of the tile result and expect the list results to be
   // displayed first.
@@ skipping 79 matching lines @@
   }
 
   // The selected container has vanished so we reset the selection to 0.
   EXPECT_EQ(0, GetSelectedIndex());
   EXPECT_EQ(-1, tile_list_view()->selected_index());
   EXPECT_EQ(0, list_view()->selected_index());
 }
 
 }  // namespace test
 }  // namespace app_list