Instant: Use only one hidden WebContents per profile.

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 a7e748b1c834ce7af16e6a7b271050063891c4dc..e271a2fc63fd1749c4ec3f5d2bcac466d68ca07f 100644
--- a/chrome/common/instant_types.h
+++ b/chrome/common/instant_types.h
@@ -5,8 +5,6 @@
 #ifndef CHROME_COMMON_INSTANT_TYPES_H_
 #define CHROME_COMMON_INSTANT_TYPES_H_
 
-#include <string>
-
 #include "base/string16.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
@@ -37,9 +35,9 @@ enum InstantSuggestionType {
 // of the suggestion and what completion behavior should be applied to it.
 struct InstantSuggestion {
   InstantSuggestion();
-  InstantSuggestion(const string16& text,
-                    InstantCompleteBehavior behavior,
-                    InstantSuggestionType type);
+  InstantSuggestion(const string16& in_text,
+                    InstantCompleteBehavior in_behavior,
+                    InstantSuggestionType in_type);
   ~InstantSuggestion();
 
   string16 text;
@@ -62,7 +60,7 @@ struct InstantAutocompleteResult {
   string16 description;
 
   // The URL of the match, same as AutocompleteMatch::destination_url.
-  string16 destination_url;
+  GURL destination_url;
 
   // The transition type to use when the user opens this match. Same as
   // AutocompleteMatch::transition.
@@ -81,29 +79,6 @@ enum InstantSizeUnits {
   INSTANT_SIZE_PERCENT,
 };
 
-// What the Instant page contains when it requests to be shown.
-// TODO(jered): Delete this.
-enum InstantShownReason {
-  // Contents are not specified; the page wants to be shown unconditionally.
-  // This is a stopgap to display in unexpected situations, and should not
-  // normally be used.
-  INSTANT_SHOWN_NOT_SPECIFIED,
-
-  // Custom content on the NTP, e.g. a custom logo.
-  INSTANT_SHOWN_CUSTOM_NTP_CONTENT,
-
-  // Query suggestions and search results relevant when the user is typing in
-  // the omnibox.
-  INSTANT_SHOWN_QUERY_SUGGESTIONS,
-
-  // ZeroSuggest suggestions relevant when the user has focused in the omnibox,
-  // but not yet typed anything.
-  INSTANT_SHOWN_ZERO_SUGGESTIONS,
-
-  // Search results in response to the user clicking a query suggestion.
-  INSTANT_SHOWN_CLICKED_QUERY_SUGGESTION,
-};
-
 // The alignment of the theme background image.
 enum ThemeBackgroundImageAlignment {
   THEME_BKGRND_IMAGE_ALIGN_CENTER,
@@ -132,9 +107,9 @@ struct ThemeBackgroundInfo {
   int color_b;
   int color_a;
 
-  // The theme id for the theme background image.
-  // Value is only valid if there's a custom theme background image.
-  std::string theme_id;
+  // The theme ID for the theme background image is only valid if there's a
+  // custom theme background image.
+  string16 theme_id;
 
   // The theme background image horizontal alignment is only valid if |theme_id|
   // is valid.
@@ -147,13 +122,16 @@ struct ThemeBackgroundInfo {
   // The theme background image tiling is only valid if |theme_id| is valid.
   ThemeBackgroundImageTiling image_tiling;
 
-  // The theme background image height.
-  // Value is only valid if |theme_id| is valid.
+  // The theme background image height is only valid if |theme_id| is valid.
   uint16 image_height;
 };
 
 // A most visited item.
 struct MostVisitedItem {
+  MostVisitedItem();
+  MostVisitedItem(const GURL& in_url, const string16& in_title);
+  ~MostVisitedItem();
+
   // URL of the most visited page.
   GURL url;