Update defaults for InstantExtended.

chrome/browser/search/search.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_SEARCH_SEARCH_H_
 #define CHROME_BROWSER_SEARCH_SEARCH_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 143 matching lines @@
 // Exposed for testing.
 bool ShouldUseCacheableNTP();
 
 // Returns true if the Instant NTP should be shown and false if not.
 bool ShouldShowInstantNTP();
 
 // Returns true if the recent tabs link should be shown on the local NTP in
 // 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
 // ToolbarModel::WouldPerformSearchTermReplacement().
 DisplaySearchButtonConditions GetDisplaySearchButtonConditions();
 
 // Returns true if the origin chip should be shown next to the omnibox. This
 // also includes the related changes to the omnibox.
 bool ShouldDisplayOriginChip();
 
@@ skipping 43 matching lines @@
 InstantSupportState GetInstantSupportStateFromNavigationEntry(
     const content::NavigationEntry& entry);
 
 // Returns true if the field trial flag is enabled to prefetch results on SRP.
 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.
 // Exposed for testing only.
 std::string GetStringValueForFlagWithDefault(const std::string& flag,
                                              const std::string& default_value,
                                              const FieldTrialFlags& flags);
 
 // Given a FieldTrialFlags object, returns the uint64 value of the provided
 // flag.
 // Exposed for testing only.
 uint64 GetUInt64ValueForFlagWithDefault(const std::string& flag,
                                         uint64 default_value,
                                         const FieldTrialFlags& flags);
 
 // Given a FieldTrialFlags object, returns the bool value of the provided flag.
 // Exposed for testing only.
 bool GetBoolValueForFlagWithDefault(const std::string& flag,
                                     bool default_value,
                                     const FieldTrialFlags& flags);
 
 // 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_