Omnibox: Add Shortcuts as InstantExtended Provider

chrome/browser/ui/omnibox/omnibox_controller_unittest.cc

 // Copyright 2013 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.
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/omnibox/omnibox_controller.h"
 #include "chrome/common/pref_names.h"
@@ skipping 51 matching lines @@
 TEST_F(OmniboxControllerTest, CheckDefaultAutocompleteProviders) {
   CreateController();
   // First collect the basic providers.
   int observed_providers = 0;
   const ACProviders* providers = GetAutocompleteProviders();
   for (size_t i = 0; i < providers->size(); ++i)
     observed_providers |= providers->at(i)->type();
   // 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();
   CreateController();
   AssertProviders(providers_with_instant_extended);
 }