Send onsubmit query down to the instant extended overlay page when a navigation is performed from t…

chrome/browser/ui/search/instant_extended_browsertest.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 <sstream>
 
 #include "base/prefs/pref_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
@@ skipping 54 matching lines @@
 }  // namespace
 
 class InstantExtendedTest : public InProcessBrowserTest,
                             public InstantTestBase {
  public:
   InstantExtendedTest()
       : on_most_visited_change_calls_(0),
         most_visited_items_count_(0),
         first_most_visited_item_id_(0),
         on_native_suggestions_calls_(0),
-        on_change_calls_(0) {
+        on_change_calls_(0),
+        submit_count_(0) {
   }
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     chrome::EnableInstantExtendedAPIForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url);
   }
 
@@ skipping 22 matching lines @@
   bool UpdateSearchState(content::WebContents* contents) WARN_UNUSED_RESULT {
     return GetIntFromJS(contents, "onMostVisitedChangedCalls",
                         &on_most_visited_change_calls_) &&
            GetIntFromJS(contents, "mostVisitedItemsCount",
                         &most_visited_items_count_) &&
            GetIntFromJS(contents, "firstMostVisitedItemId",
                         &first_most_visited_item_id_) &&
            GetIntFromJS(contents, "onNativeSuggestionsCalls",
                         &on_native_suggestions_calls_) &&
            GetIntFromJS(contents, "onChangeCalls",
-                        &on_change_calls_);
+                        &on_change_calls_) &&
+           GetIntFromJS(contents, "submitCount",
+                        &submit_count_) &&
+           GetStringFromJS(contents, "apiHandle.value",
+                           &query_value_);
   }
 
   int on_most_visited_change_calls_;
   int most_visited_items_count_;
   int first_most_visited_item_id_;
   int on_native_suggestions_calls_;
   int on_change_calls_;
+  int submit_count_;
+  std::string query_value_;
 };
 
 // Test class used to verify chrome-search: scheme and access policy from the
 // Instant overlay.  This is a subclass of |ExtensionBrowserTest| because it
 // loads a theme that provides a background image.
 class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
  public:
   InstantPolicyTest() {}
 
  protected:
@@ skipping 305 matching lines @@
   std::string result;
   EXPECT_TRUE(GetStringFromJS(instant()->GetOverlayContents(),
                               "window.chrome.searchBox.value",
                               &result));
   EXPECT_EQ("hello", result);
 
   EXPECT_TRUE(HasUserInputInProgress());
   // TODO(beaudoin): Figure out why this fails.
   // EXPECT_FALSE(HasTemporaryText());
 
-
   // Commit the search by pressing Enter.
   browser()->window()->GetLocationBar()->AcceptInput();
   EXPECT_EQ("hello", GetOmniboxText());
 }
 
 // This test simulates a search provider using the InstantExtended API to
+// navigate through the suggested results and back to the original user query.
+// If this test starts to flake, it may be that the second call to AcceptInput
+// below causes instant()->instant_tab() to no longer be valid due to e.g. a
+// navigation. In that case, see https://codereview.chromium.org/12895007/#msg28
+// and onwards for possible alternatives.
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
+                       NavigateToURLSuggestionHitEnterAndLookForSubmit) {
+  ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
+  FocusOmniboxAndWaitForInstantExtendedSupport();
+
+  // Create an observer to wait for the instant tab to support Instant.
+  content::WindowedNotificationObserver observer(
+      chrome::NOTIFICATION_INSTANT_TAB_SUPPORT_DETERMINED,
+      content::NotificationService::AllSources());
+
+  // Do a search and commit it.
+  SetOmniboxTextAndWaitForOverlayToShow("hello k");
+  EXPECT_EQ(ASCIIToUTF16("hello k"), omnibox()->GetText());
+  browser()->window()->GetLocationBar()->AcceptInput();
+  observer.Wait();
+
+  SetOmniboxText("http");
+  EXPECT_EQ("http", GetOmniboxText());
+
+  SendDownArrow();
+  EXPECT_EQ("result 1", GetOmniboxText());
+  SendDownArrow();
+  EXPECT_EQ("result 2", GetOmniboxText());
+  SendDownArrow();
+  EXPECT_EQ("http://www.google.com", GetOmniboxText());
+
+  EXPECT_TRUE(HasUserInputInProgress());
+
+  EXPECT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
+  // Note the commit count is initially 1 due to the AcceptInput() call above.
+  EXPECT_EQ(1, submit_count_);
+
+  std::string old_query_value(query_value_);
+
+  // Commit the search by pressing Enter.
+  browser()->window()->GetLocationBar()->AcceptInput();
+
+  // Make sure a submit message got sent.
+  EXPECT_TRUE(UpdateSearchState(instant()->instant_tab()->contents()));
+  EXPECT_EQ(2, submit_count_);
+  EXPECT_EQ(old_query_value, query_value_);
+}
+
+// This test simulates a search provider using the InstantExtended API to
 // navigate through the suggested results and hitting escape to get back to the
 // original user query.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsAndHitEscape) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   SetOmniboxTextAndWaitForOverlayToShow("hello");
   EXPECT_EQ("hello", GetOmniboxText());
 
   SendDownArrow();
@@ skipping 961 matching lines @@
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
 
   EXPECT_EQ(instant_url(), instant()->ntp_->contents()->GetURL());
 
   // The second argument says to use only the local overlay.
   instant()->SetInstantEnabled(false, true);
 
   EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl),
             instant()->ntp_->contents()->GetURL());
 }