InstantExtended: Adding InstantRestrictedIDCache.

chrome/common/instant_types.h

Index: chrome/common/instant_types.h
diff --git a/chrome/common/instant_types.h b/chrome/common/instant_types.h
index ae371c9a2a3d27687e26878c7b28fe707c7ce9a7..1cf0873d84a6b4e67c42a7f720f960642533e6eb 100644
--- a/chrome/common/instant_types.h
+++ b/chrome/common/instant_types.h
@@ -11,6 +11,13 @@
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 
+// ID used by Instant code to refer to objects (e.g. Autocomplete results, Most
+// Visited items) that the Instant page needs access to.
+typedef int InstantRestrictedID;
+
+// The size of the InstantMostVisitedItem cache.
+const size_t kMaxInstantMostVisitedItemCacheSize = 100;
+
 // Ways that the Instant suggested text is autocompleted into the omnibox.
 enum InstantCompleteBehavior {
   // Autocomplete the suggestion immediately.
@@ -72,6 +79,10 @@ struct InstantAutocompleteResult {
   int relevance;
 };
 
+// An InstantAutocompleteResult along with its assigned restricted ID.
+typedef std::pair<InstantRestrictedID, InstantAutocompleteResult>
+    InstantAutocompleteResultIDPair;
+
 // How to interpret the size (height or width) of the Instant overlay (preview).
 enum InstantSizeUnits {
   // As an absolute number of pixels.
@@ -153,11 +164,6 @@ struct ThemeBackgroundInfo {
 };
 
 struct InstantMostVisitedItem {
-  InstantMostVisitedItem() : most_visited_item_id(0) {}
-
-  // A private identifier used on the browser side when retrieving assets.
-  uint64 most_visited_item_id;
-
   // The URL of the Most Visited item.
   GURL url;
 
@@ -166,4 +172,8 @@ struct InstantMostVisitedItem {
   string16 title;
 };
 
+// An InstantMostVisitedItem along with its assigned restricted ID.
+typedef std::pair<InstantRestrictedID, InstantMostVisitedItem>
+    InstantMostVisitedItemIDPair;
+
 #endif  // CHROME_COMMON_INSTANT_TYPES_H_