NTP: Fix "Undo" option of the "Item removed" snackbar

chrome/browser/android/ntp/most_visited_sites.cc

 // 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.
 
 #include "chrome/browser/android/ntp/most_visited_sites.h"
 
 #include <utility>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
@@ skipping 617 matching lines @@
   MostVisitedSites::SuggestionsVector whitelist_suggestions =
       CreateWhitelistEntryPointSuggestions(*personal_suggestions);
   MostVisitedSites::SuggestionsVector popular_sites_suggestions =
       CreatePopularSitesSuggestions(*personal_suggestions,
                                     whitelist_suggestions);
   size_t num_actual_tiles = personal_suggestions->size() +
                             whitelist_suggestions.size() +
                             popular_sites_suggestions.size();
   std::vector<std::string> old_sites_url;
   std::vector<bool> old_sites_is_personal;
-  GetPreviousNTPSites(num_actual_tiles, &old_sites_url, &old_sites_is_personal);
+  // TODO(treib): We used to call |GetPreviousNTPSites| here to populate
+  // |old_sites_url| and |old_sites_is_personal|, but that caused problems
+  // (crbug.com/585391). Either figure out a way to fix them and re-enable,
+  // or properly remove the order-persisting code. crbug.com/601734
   MostVisitedSites::SuggestionsVector merged_suggestions = MergeSuggestions(
       personal_suggestions, &whitelist_suggestions, &popular_sites_suggestions,
       old_sites_url, old_sites_is_personal);
   DCHECK_EQ(num_actual_tiles, merged_suggestions.size());
   current_suggestions_.swap(merged_suggestions);
   if (received_popular_sites_)
     SaveCurrentNTPSites();
 }
 
 // static
@@ skipping 219 matching lines @@
   }
 }
 
 static jlong Init(JNIEnv* env,
                   const JavaParamRef<jobject>& obj,
                   const JavaParamRef<jobject>& jprofile) {
   MostVisitedSites* most_visited_sites =
       new MostVisitedSites(ProfileAndroid::FromProfileAndroid(jprofile));
   return reinterpret_cast<intptr_t>(most_visited_sites);
 }