Added support for passing WindowOpenDisposition into BrowserInstantController::OpenURL() from the o…

chrome/browser/instant/instant_browsertest.cc

 // 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.
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/instant/instant_loader.h"
 #include "chrome/browser/instant/instant_model_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/search_engines/template_url_service.h"
@@ skipping 956 matching lines @@
   // how that is encoded.
   // U+1E0D = LATIN SMALL LETTER D WITH DOT BELOW
   // U+1E0B = LATIN SMALL LETTER D WITH DOT ABOVE
   EXPECT_TRUE(ExecuteScript("suggestion = [ { value: '\\u1e0d\\u0307oh' } ]"));
 
   omnibox()->RevertAll();
   SetOmniboxTextAndWaitForInstantToShow(WideToUTF8(L"\u1e0b\u0323"));
   EXPECT_EQ(WideToUTF16(L"\u1e0b\u0323oh"), omnibox()->GetText());
 }
 
+// Test that middle clicking on a suggestion opens the result in a new tab.
+IN_PROC_BROWSER_TEST_F(InstantTest, MiddleClickOnSuggestionOpensInNewTab) {
+  ASSERT_NO_FATAL_FAILURE(SetupInstant());
+  FocusOmniboxAndWaitForInstantSupport();
+
+  GURL url(std::string("http://google.com"));
+  LOG(ERROR) << "BEFORE: TAB COUNT: " << browser()->tab_strip_model()->count();
+  instant()->NavigateToURL(url, content::PAGE_TRANSITION_TYPED, NEW_BACKGROUND_TAB);
+  LOG(ERROR) << "AFTER: TAB COUNT: " << browser()->tab_strip_model()->count();
+
+  // Check that we have two tabs and that the new active tab is indeed what was
+  // once the preview. The preview tab should have just one navigation entry,
+  // for the Instant search that was committed.
+  EXPECT_EQ(2, browser()->tab_strip_model()->count());

[dougw, 2013/01/24 03:05:25]

Any idea why this is failing? 

I've started debugging this test in gdb. I'm hoping there's a better approach
(or that I'm doing something obviously wrong :).

[sreeram, 2013/01/24 03:50:08]

Sure :) It's because these tests (InstantTest.*) are the old-style Instant. To
use NavigateToURL (and test the middle click and such), you need to write an
InstantExtendedTest, in instant_extended_browsertest.cc.

+}
+
 // Flakes on Windows: http://crbug.com/170677
 #if defined(OS_WIN)
 #define MAYBE_CommitInNewTab DISABLED_CommitInNewTab
 #else
 #define MAYBE_CommitInNewTab CommitInNewTab
 #endif
 // Test that the preview can be committed onto a new tab.
 IN_PROC_BROWSER_TEST_F(InstantTest, MAYBE_CommitInNewTab) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant());
   FocusOmniboxAndWaitForInstantSupport();
@@ skipping 101 matching lines @@
   SetOmniboxTextAndWaitForInstantToShow("q");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 
   // Kill the instant renderer and wait for instant support again.
   KillInstantRenderView();
   FocusOmniboxAndWaitForInstantSupport();
 
   SetOmniboxTextAndWaitForInstantToShow("qu");
   EXPECT_EQ(ASCIIToUTF16("query suggestion"), omnibox()->GetText());
 }