Merge 132468 - [NTP4] Fix empty apps page crash.

chrome/browser/extensions/extension_sorting.h

Index: chrome/browser/extensions/extension_sorting.h
===================================================================
--- chrome/browser/extensions/extension_sorting.h	(revision 132527)
+++ chrome/browser/extensions/extension_sorting.h	(working copy)
@@ -93,7 +93,7 @@
 
   // Converts the page index integer to its StringOrdinal equivalent. This takes
   // O(# of apps) worst-case.
-  StringOrdinal PageIntegerAsStringOrdinal(size_t page_index) const;
+  StringOrdinal PageIntegerAsStringOrdinal(size_t page_index);
 
  private:
   // Unit tests.
@@ -129,6 +129,9 @@
                          const StringOrdinal& page_ordinal,
                          const StringOrdinal& app_launch_ordinal);
 
+  // Ensures |ntp_ordinal_map_| is of |minimum_size| number of entries.
+  void CreateOrdinalsIfNecessary(size_t minimum_size);
+
   // Removes the mapping for |extension_id| with a page ordinal of
   // |page_ordinal| and a app launch ordinal of |app_launch_ordinal|. If there
   // is not matching map, nothing happens. This works with valid and invalid