Omnibox: Add Shortcuts as InstantExtended Provider

We might as well now that InstantExtended is using the native omnibox.  
Besides, it has a positive effect on quality.

For now, I left the framework that allows InstantExtended to use a
different set of providers.  I'll leave it up to Jered or Brett to decide
if they're ready to get rid of it.

BUG=252892

Review URL: https://chromiumcodereview.appspot.com/17563007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208071 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/autocomplete/autocomplete_classifier.cc

@@ -32,6 +32,7 @@ const int AutocompleteClassifier::kInstantExtendedOmniboxProviders =
     // TODO: remove TYPE_SEARCH once it's no longer needed to pass
     // the Instant suggestion through via FinalizeInstantQuery.
     AutocompleteProvider::TYPE_SEARCH |
+    AutocompleteProvider::TYPE_SHORTCUTS |
     AutocompleteProvider::TYPE_ZERO_SUGGEST;
 
 AutocompleteClassifier::AutocompleteClassifier(Profile* profile)

chrome/browser/ui/omnibox/omnibox_controller_unittest.cc

@@ -69,11 +69,8 @@ TEST_F(OmniboxControllerTest, CheckDefaultAutocompleteProviders) {
   // Ensure we have at least one provider.
   ASSERT_NE(0, observed_providers);
 
-  // Ensure instant extended includes all the basic ones save for those that are
-  // not expected to run in instant extended.
-  int providers_with_instant_extended =
-      observed_providers &
-      ~AutocompleteProvider::TYPE_SHORTCUTS;
+  // Ensure instant extended includes all the provides in classic Chrome.
+  int providers_with_instant_extended = observed_providers;
   // TODO(beaudoin): remove TYPE_SEARCH once it's no longer needed to pass
   // the Instant suggestion through via FinalizeInstantQuery.
   chrome::EnableInstantExtendedAPIForTesting();