MostVisitedSites cleanup: kill SuggestionsPtrVector

components/ntp_tiles/most_visited_sites.h

 // 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.
 
 #ifndef COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 #define COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 143 matching lines @@
   void RecordOpenedMostVisitedItem(int index, int tile_type);
 
   // MostVisitedSitesSupervisor::Observer implementation.
   void OnBlockedSitesChanged() override;
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
  private:
   friend class MostVisitedSitesTest;
 
-  // TODO(treib): use SuggestionsVector in internal functions. crbug.com/601734
-  using SuggestionsPtrVector = std::vector<std::unique_ptr<Suggestion>>;
-
   void BuildCurrentSuggestions();
 
   // Initialize the query to Top Sites. Called if the SuggestionsService
   // returned no data.
   void InitiateTopSitesQuery();
 
   // If there's a whitelist entry point for the URL, return the large icon path.
   base::FilePath GetWhitelistLargeIconPath(const GURL& url);
 
   // Callback for when data is available from TopSites.
   void OnMostVisitedURLsAvailable(
       const history::MostVisitedURLList& visited_list);
 
   // Callback for when data is available from the SuggestionsService.
   void OnSuggestionsProfileAvailable(
       const suggestions::SuggestionsProfile& suggestions_profile);
 
   // Takes the personal suggestions and creates whitelist entry point
   // suggestions if necessary.
-  SuggestionsPtrVector CreateWhitelistEntryPointSuggestions(
-      const SuggestionsPtrVector& personal_suggestions);
+  SuggestionsVector CreateWhitelistEntryPointSuggestions(
+      const SuggestionsVector& personal_suggestions);
 
   // Takes the personal and whitelist suggestions and creates popular
   // suggestions if necessary.
-  SuggestionsPtrVector CreatePopularSitesSuggestions(
-      const SuggestionsPtrVector& personal_suggestions,
-      const SuggestionsPtrVector& whitelist_suggestions);
+  SuggestionsVector CreatePopularSitesSuggestions(
+      const SuggestionsVector& personal_suggestions,
+      const SuggestionsVector& whitelist_suggestions);
 
   // Takes the personal suggestions, creates and merges in whitelist and popular
   // suggestions if appropriate, and saves the new suggestions.
-  void SaveNewSuggestions(SuggestionsPtrVector* personal_suggestions);
+  void SaveNewSuggestions(SuggestionsVector personal_suggestions);
 
   // Workhorse for SaveNewSuggestions above. Implemented as a separate static
   // method for ease of testing.
-  static SuggestionsPtrVector MergeSuggestions(
-      SuggestionsPtrVector* personal_suggestions,
-      SuggestionsPtrVector* whitelist_suggestions,
-      SuggestionsPtrVector* popular_suggestions);
-
-  // Appends suggestions from |src| to |dst|.
-  static void AppendSuggestions(SuggestionsPtrVector* src,
-                                SuggestionsPtrVector* dst);
+  static SuggestionsVector MergeSuggestions(
+      SuggestionsVector personal_suggestions,
+      SuggestionsVector whitelist_suggestions,
+      SuggestionsVector popular_suggestions);
 
   void SaveCurrentSuggestionsToPrefs();
 
   // Notifies the observer about the availability of suggestions.
   // Also records impressions UMA if not done already.
   void NotifyMostVisitedURLsObserver();
 
   void OnPopularSitesAvailable(bool success);
 
   // Runs on the UI Thread.
@@ skipping 65 matching lines @@
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 }  // namespace ntp_tiles
 
 #endif  // COMPONENTS_NTP_TILES_MOST_VISITED_SITES_H_