MostVisitedSites: Remove unused order-persisting code

chrome/browser/android/ntp/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 CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_
 #define CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 107 matching lines @@
   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 is not
-  // enabled, or if it returns no data.
+  // 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);
 
   // Takes the personal and whitelist suggestions and creates popular
   // suggestions if necessary.
   SuggestionsPtrVector CreatePopularSitesSuggestions(
       const SuggestionsPtrVector& personal_suggestions,
       const SuggestionsPtrVector& whitelist_suggestions);
 
   // Takes the personal suggestions, creates and merges in whitelist and popular
   // suggestions if appropriate, and saves the new suggestions.
-  void SaveNewNTPSuggestions(SuggestionsPtrVector* personal_suggestions);
+  void SaveNewSuggestions(SuggestionsPtrVector* personal_suggestions);
 
-  // Workhorse for SaveNewNTPSuggestions above. Implemented as a separate static
+  // 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,
-      const std::vector<std::string>& old_sites_url,
-      const std::vector<bool>& old_sites_is_personal);
+      SuggestionsPtrVector* popular_suggestions);
 
-  void GetPreviousNTPSites(size_t num_tiles,
-                           std::vector<std::string>* old_sites_url,
-                           std::vector<bool>* old_sites_source) const;
+  // Appends suggestions from |src| to |dst|.
+  static void AppendSuggestions(SuggestionsPtrVector* src,
+                                SuggestionsPtrVector* dst);
 
-  void SaveCurrentNTPSites();
-
-  // Takes suggestions from |src_suggestions| and moves them to
-  // |dst_suggestions| if the suggestion's url/host matches
-  // |match_urls|/|match_hosts| respectively. Unmatched suggestion indices from
-  // |src_suggestions| are returned for ease of insertion later.
-  static std::vector<size_t> InsertMatchingSuggestions(
-      SuggestionsPtrVector* src_suggestions,
-      SuggestionsPtrVector* dst_suggestions,
-      const std::vector<std::string>& match_urls,
-      const std::vector<std::string>& match_hosts);
-
-  // Inserts suggestions from |src_suggestions| at positions |insert_positions|
-  // into |dst_suggestions| where ever empty starting from |start_position|.
-  // Returns the last filled position so that future insertions can start from
-  // there.
-  static size_t InsertAllSuggestions(
-      size_t start_position,
-      const std::vector<size_t>& insert_positions,
-      SuggestionsPtrVector* src_suggestions,
-      SuggestionsPtrVector* dst_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.
   void OnLocalThumbnailFetched(
       const GURL& url,
@@ skipping 65 matching lines @@
 
   SuggestionsVector current_suggestions_;
 
   // For callbacks may be run after destruction.
   base::WeakPtrFactory<MostVisitedSites> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MostVisitedSites);
 };
 
 #endif  // CHROME_BROWSER_ANDROID_NTP_MOST_VISITED_SITES_H_