diff options
| author | jered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 03:32:02 +0000 |
|---|---|---|
| committer | jered@chromium.org <jered@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 03:32:02 +0000 |
| commit | 68be887dac8c482ac96cfd3899ebff998ae86222 (patch) | |
| tree | f2d01c5173a0ce887ab320d33c566e0725bd9cf1 | |
| parent | a5385cbe4533079eae8cd4024c3f71f9478dffd8 (diff) | |
| download | chromium_src-68be887dac8c482ac96cfd3899ebff998ae86222.zip chromium_src-68be887dac8c482ac96cfd3899ebff998ae86222.tar.gz chromium_src-68be887dac8c482ac96cfd3899ebff998ae86222.tar.bz2 | |
InstantExtended: Ignore SearchProvider
BUG=180641
Review URL: https://chromiumcodereview.appspot.com/12541015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186600 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/instant/instant_controller.cc | 3 | ||||
| -rw-r--r-- | chrome/browser/instant/instant_extended_browsertest.cc | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/instant/instant_controller.cc b/chrome/browser/instant/instant_controller.cc index 862c8a0..14b4d16 100644 --- a/chrome/browser/instant/instant_controller.cc +++ b/chrome/browser/instant/instant_controller.cc @@ -491,6 +491,9 @@ void InstantController::HandleAutocompleteResults( std::vector<InstantAutocompleteResult> results; for (ACProviders::const_iterator provider = providers.begin(); provider != providers.end(); ++provider) { + // Skip SearchProvider, since it only echoes suggestions. + if ((*provider)->type() == AutocompleteProvider::TYPE_SEARCH) + continue; for (ACMatches::const_iterator match = (*provider)->matches().begin(); match != (*provider)->matches().end(); ++match) { InstantAutocompleteResult result; diff --git a/chrome/browser/instant/instant_extended_browsertest.cc b/chrome/browser/instant/instant_extended_browsertest.cc index e265799..ffb5820 100644 --- a/chrome/browser/instant/instant_extended_browsertest.cc +++ b/chrome/browser/instant/instant_extended_browsertest.cc @@ -165,8 +165,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, EXPECT_EQ(1, browser()->tab_strip_model()->count()); // Typing in the omnibox should show the overlay. - SetOmniboxTextAndWaitForOverlayToShow("santa"); - EXPECT_TRUE(instant()->IsOverlayingSearchResults()); + SetOmniboxTextAndWaitForOverlayToShow("http://www.example.com/"); // Create an event listener that opens the top suggestion in a new tab. EXPECT_TRUE(ExecuteScript( @@ -189,7 +188,7 @@ IN_PROC_BROWSER_TEST_F(InstantExtendedTest, // Check that the new tab URL is as expected. content::WebContents* new_tab_contents = browser()->tab_strip_model()->GetWebContentsAt(1); - EXPECT_EQ(new_tab_contents->GetURL().spec(), instant_url_.spec()+"q=santa"); + EXPECT_EQ("http://www.example.com/", new_tab_contents->GetURL().spec()); // Check that there are now two tabs. EXPECT_EQ(2, browser()->tab_strip_model()->count()); |