Update defaults for InstantExtended.

chrome/browser/search/search.h

Index: chrome/browser/search/search.h
diff --git a/chrome/browser/search/search.h b/chrome/browser/search/search.h
index 00dd2556960296fa53ccebab429dca58ee8b825f..40a37dee919ed305272e4d01fd8869ed048c2431 100644
--- a/chrome/browser/search/search.h
+++ b/chrome/browser/search/search.h
@@ -161,10 +161,6 @@ bool ShouldShowInstantNTP();
 // field trials.
 bool ShouldShowRecentTabsOnNTP();
 
-// Returns true if Instant Extended should be disabled on the search results
-// page.
-bool ShouldSuppressInstantExtendedOnSRP();
-
 // Returns when we should show a search button in the omnibox.  This may be any
 // of several values, some of which depend on whether the underlying state of
 // the page would normally be to perform search term replacement; see also
@@ -228,26 +224,20 @@ bool ShouldPrefetchSearchResultsOnSRP();
 // The following APIs are exposed for use in tests only.
 // -----------------------------------------------------
 
-// Forces the Instant Extended API to be enabled for tests.
-void EnableInstantExtendedAPIForTesting();
-
-// Forces the Instant Extended API to be disabled for tests.
-void DisableInstantExtendedAPIForTesting();
+// Forces query in the omnibox to be enabled for tests.
+void EnableQueryExtractionForTesting();
 
 // Type for a collection of experiment configuration parameters.
 typedef std::vector<std::pair<std::string, std::string> > FieldTrialFlags;
 
-// Finds the active field trial group name and parses out the group number and
-// configuration flags. On success, |flags| will be filled with the field trial
-// flags. |flags| must not be NULL. If not NULL, |group_number| will receive the
-// experiment group number.
-// Returns true iff the active field trial is successfully parsed and not
-// disabled.
+// Finds the active field trial group name and parses out the configuration
+// flags. On success, |flags| will be filled with the field trial flags. |flags|
+// must not be NULL.  Returns true iff the active field trial is successfully
+// parsed and not disabled.
 // Note that |flags| may be successfully populated in some cases when false is
 // returned - in these cases it should not be used.
 // Exposed for testing only.
-bool GetFieldTrialInfo(FieldTrialFlags* flags,
-                       uint64* group_number);
+bool GetFieldTrialInfo(FieldTrialFlags* flags);
 
 // Given a FieldTrialFlags object, returns the string value of the provided
 // flag.
@@ -272,10 +262,6 @@ bool GetBoolValueForFlagWithDefault(const std::string& flag,
 // Returns the Cacheable New Tab Page URL for the given |profile|.
 GURL GetNewTabPageURL(Profile* profile);
 
-// Let tests reset the gate that prevents metrics from being sent more than
-// once.
-void ResetInstantExtendedOptInStateGateForTest();
-
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_SEARCH_SEARCH_H_