Merge: Propagate the search request params from the browser to the Instant search base page to fix …

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 e482a52a8946aacc0082c6d39b706791e4c5569f..bc33f89aac5c934ea2ad84ce951c5bdf3d8fb985 100644
--- a/chrome/common/instant_types.h
+++ b/chrome/common/instant_types.h
@@ -131,4 +131,40 @@ struct InstantMostVisitedItem {
 typedef std::pair<InstantRestrictedID, InstantMostVisitedItem>
     InstantMostVisitedItemIDPair;
 
+// Embedded search request logging stats params.
+extern const char kSearchQueryKey[];
+extern const char kOriginalQueryKey[];
+extern const char kRLZParameterKey[];
+extern const char kInputEncodingKey[];
+extern const char kAssistedQueryStatsKey[];
+
+// A wrapper to hold embedded search request params. Used to tell the server
+// about the search query logging stats at the query submission time.
+struct EmbeddedSearchRequestParams {
+  EmbeddedSearchRequestParams();
+  // Extracts the request params from the |url| and initializes the member
+  // variables.
+  explicit EmbeddedSearchRequestParams(const GURL& url);
+  ~EmbeddedSearchRequestParams();
+
+  // Submitted search query.
+  base::string16 search_query;
+
+  // User typed query.
+  base::string16 original_query;
+
+  // RLZ parameter.
+  base::string16 rlz_parameter_value;
+
+  // Character input encoding type.
+  base::string16 input_encoding;
+
+  // The optional assisted query stats, aka AQS, used for logging purposes.
+  // This string contains impressions of all autocomplete matches shown
+  // at the query submission time.  For privacy reasons, we require the
+  // search provider to support HTTPS protocol in order to receive the AQS
+  // param.
+  // For more details, see http://goto.google.com/binary-clients-logging.
+  base::string16 assisted_query_stats;
+};
 #endif  // CHROME_COMMON_INSTANT_TYPES_H_