Update defaults for InstantExtended.

chrome/common/chrome_switches.cc

Index: chrome/common/chrome_switches.cc
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index edf351ef05ed428831084b41dce74b3c9d55c786..8f3125107e85e8603e5fbd3cbd270489dc1d3f87 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -351,9 +351,6 @@ const char kDisableExtensionsResourceWhitelist[] =
 // Disables Google Now integration.
 const char kDisableGoogleNowIntegration[] = "disable-google-now-integration";
 
-// Disable Instant extended API.
-const char kDisableInstantExtendedAPI[]     = "disable-instant-extended-api";
-
 // Disables improved SafeBrowsing download protection.
 const char kDisableImprovedDownloadProtection[] =
     "disable-improved-download-protection";
@@ -369,9 +366,6 @@ const char kDisableIPv6[]                   = "disable-ipv6";
 // attempt to use the existing connection.
 const char kDisableIPPooling[]              = "disable-ip-pooling";
 
-// Disable always using the local NTP for the first NTP load of a new window.
-const char kDisableLocalFirstLoadNTP[] = "disable-local-first-load-ntp";
-
 // Disable the behavior that the second click on a launcher item (the click when
 // the item is already active) minimizes the item.
 const char kDisableMinimizeOnSecondLauncherItemClick[] =
@@ -629,10 +623,6 @@ const char kEnableHttp2Draft04[]            = "enable-http2-draft-04";
 // Enables the inline sign in flow on Chrome desktop.
 const char kEnableInlineSignin[]            = "enable-inline-signin";
 
-// Enable Instant extended API. On mobile, this merely enables query extraction,
-// not the rest of the instant-extended functionality.
-const char kEnableInstantExtendedAPI[]      = "enable-instant-extended-api";
-
 // Enables IPv6 support, even if probes suggest that it may not be fully
 // supported. Some probes may require internet connections, and this flag will
 // allow support independent of application testing. This flag overrides
@@ -644,9 +634,6 @@ const char kEnableIPv6[]                    = "enable-ipv6";
 // attempt to use the existing connection.
 const char kEnableIPPooling[]               = "enable-ip-pooling";
 
-// Enable always using the local NTP for the first NTP load of a new window.
-const char kEnableLocalFirstLoadNTP[] = "enable-local-first-load-ntp";
-
 // Enables support for user profiles that are managed by another user and can
 // have restrictions applied.
 const char kEnableManagedUsers[]            = "enable-managed-users";
@@ -710,6 +697,9 @@ const char kEnablePrivetLocalPrinting[]     = "enable-privet-local-printing";
 // during chrome_browser_main.
 const char kEnableProfiling[]               = "enable-profiling";
 
+// Enables query in the omnibox.
+const char kEnableQueryExtraction[]         = "enable-query-extraction";
+
 // Enables support for the QUIC protocol.  This is a temporary testing flag.
 const char kEnableQuic[]                    = "enable-quic";
 
@@ -1453,9 +1443,6 @@ const char kUninstall[]                     = "uninstall";
 // apps/origins.  This should be used only for testing purpose.
 const char kUnlimitedStorage[]              = "unlimited-storage";
 
-// Use the cacheable New Tab page for Embedded Search.
-const char kUseCacheableNewTabPage[]        = "use-cacheable-new-tab-page";
-
 // Uses Spdy for the transport protocol instead of HTTP. This is a temporary
 // testing flag.
 const char kUseSpdy[]                       = "use-spdy";