Instant extended: Remove suggest commit on lost focus

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 316 matching lines @@
   // Set the text, and wait for suggestions to show up.
   SetOmniboxTextAndWaitForOverlayToShow("johnny");
   EXPECT_EQ(ASCIIToUTF16("johnny"), omnibox()->GetText());
 
   // Test that the current suggestion is correctly set.
   EXPECT_EQ(ASCIIToUTF16(" depp"), GetGrayText());
 
   // Commit the overlay by lost focus (e.g. clicking on the page).
   instant()->CommitIfPossible(INSTANT_COMMIT_FOCUS_LOST);
 
-  // Search term extraction should kick in with the autocompleted text.
-  EXPECT_EQ(ASCIIToUTF16("johnny depp"), omnibox()->GetText());
-
-  // Suggestion should be cleared at this point.
-  EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
+  // Omnibox text and suggestion should not be changed.
+  EXPECT_EQ(ASCIIToUTF16("johnny"), omnibox()->GetText());
+  EXPECT_EQ(ASCIIToUTF16(" depp"), GetGrayText());
 }
 
 // Test that omnibox text is correctly set when clicking on committed SERP.
 // Disabled on Mac because omnibox focus loss is not working correctly.
-#if defined(OS_MACOSX)
-#define MAYBE_OmniboxTextUponFocusedCommittedSERP \
-    DISABLED_OmniboxTextUponFocusedCommittedSERP
-#else
-#define MAYBE_OmniboxTextUponFocusedCommittedSERP \
-    OmniboxTextUponFocusedCommittedSERP
-#endif
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
-                       MAYBE_OmniboxTextUponFocusedCommittedSERP) {
+                       OmniboxTextUponFocusedCommittedSERP) {
   // Setup Instant.
   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();
 
   // With a committed results page, do a search by unfocusing the omnibox and
   // focusing the contents.
   SetOmniboxText("hello");
   // Calling handleOnChange manually to make sure it is called before the
   // Focus() call below.
   EXPECT_TRUE(content::ExecuteScript(instant()->instant_tab()->contents(),
                                      "suggestion = 'hello kitty';"
                                      "handleOnChange();"));
   instant()->instant_tab()->contents()->GetView()->Focus();
 
-  // Search term extraction should kick in with the autocompleted text.
-  EXPECT_EQ(ASCIIToUTF16("hello kitty"), omnibox()->GetText());
-
-  // Suggestion should be cleared at this point.
-  EXPECT_EQ(ASCIIToUTF16(""), GetGrayText());
+  // Omnibox text and suggestion should not be changed.
+  EXPECT_EQ(ASCIIToUTF16("hello"), omnibox()->GetText());
+  EXPECT_EQ(ASCIIToUTF16(" kitty"), GetGrayText());
 }
 
 // Checks that a previous Navigation suggestion is not re-used when a search
-// suggestion comes in. Disabled on Mac because omnibox focus loss is not
-// working correctly. http://crbug.com/178520
-#if defined(OS_MACOSX)
-#define MAYBE_NavigationSuggestionIsDiscardedUponSearchSuggestion \
-        DISABLED_NavigationSuggestionIsDiscardedUponSearchSuggestion
-#else
-#define MAYBE_NavigationSuggestionIsDiscardedUponSearchSuggestion \
-        NavigationSuggestionIsDiscardedUponSearchSuggestion
-#endif
+// suggestion comes in.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
-    MAYBE_NavigationSuggestionIsDiscardedUponSearchSuggestion) {
+                       NavigationSuggestionIsDiscardedUponSearchSuggestion) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
 
   // Tell the page to send a URL suggestion.
   EXPECT_TRUE(ExecuteScript("suggestion = 'http://www.example.com';"
                             "behavior = 1;"));
   SetOmniboxTextAndWaitForOverlayToShow("exa");
   EXPECT_EQ(ASCIIToUTF16("example.com"), omnibox()->GetText());
 
   // Now send a search suggestion and see that Navigation suggestion is no
   // longer kept.
+  EXPECT_TRUE(ExecuteScript("suggestion = 'exams are great';"
+                            "behavior = 2;"));
   SetOmniboxText("exam");
-  EXPECT_TRUE(ExecuteScript("suggestion = 'exams are great';"
-                            "behavior = 2;"
-                            "handleOnChange();"));
+  // Wait for JavaScript to run handleOnChange by executing a blank script.
+  EXPECT_TRUE(ExecuteScript(std::string()));
+
   instant()->overlay()->contents()->GetView()->Focus();
-  EXPECT_EQ(ASCIIToUTF16("exams are great"), omnibox()->GetText());
+  EXPECT_EQ(ASCIIToUTF16("exam"), omnibox()->GetText());
+  EXPECT_EQ(ASCIIToUTF16("s are great"), GetGrayText());
 
   // TODO(jered): Remove this after fixing OnBlur().
   omnibox()->RevertAll();
 }
 
 // This test simulates a search provider using the InstantExtended API to
 // navigate through the suggested results and back to the original user query.
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest, NavigateSuggestionsWithArrowKeys) {
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmniboxAndWaitForInstantExtendedSupport();
@@ skipping 1002 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());
 }