Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

chrome/browser/autocomplete/autocomplete_browsertest.cc

 // Copyright (c) 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 <stddef.h>
 
 #include "base/command_line.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/search_test_utils.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/browser/autocomplete_input.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/omnibox_popup_model.h"
 #include "components/omnibox/browser/omnibox_view.h"
+#include "components/search_engines/template_url_service.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 base::string16 AutocompleteResultAsString(const AutocompleteResult& result) {
   std::string output(base::StringPrintf("{%" PRIuS "} ", result.size()));
   for (size_t i = 0; i < result.size(); ++i) {
     AutocompleteMatch match = result.match_at(i);
@@ skipping 14 matching lines @@
   }
 
   LocationBar* GetLocationBar() const {
     return browser()->window()->GetLocationBar();
   }
 
   AutocompleteController* GetAutocompleteController() const {
     return GetLocationBar()->GetOmniboxView()->model()->popup_model()->
         autocomplete_controller();
   }
+
+  void FocusSearchCheckPreconditions() {

[Peter Kasting, 2016/04/15 00:58:55]

Nit: Technically, I think this could be const, since GetLocationBar() is const. 
But really that function violates a style rule that const functions not return
non-const pointers.  So honestly either that function shouldn't be const, or it
should return a pointer-to-const -- and similarly for
GetAutocompleteController().  Fixing these in turn will be annoying and isn't
related to this CL at all, so either do it separately or just don't worry about
it.

[Tom (Use chromium acct), 2016/04/15 05:20:51]

Acknowledged.

+    LocationBar* location_bar = GetLocationBar();
+    OmniboxView* omnibox_view = location_bar->GetOmniboxView();
+    OmniboxEditModel* omnibox_model = omnibox_view->model();
+
+    EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
+    EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL),
+              omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_FALSE(omnibox_model->is_keyword_selected());
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
 
@@ skipping 119 matching lines @@
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
 
   WaitForTemplateURLServiceToLoad();
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* omnibox_view = location_bar->GetOmniboxView();
+  OmniboxEditModel* omnibox_model = omnibox_view->model();
 
-  // Focus search when omnibox is blank
+  TemplateURLService* template_url_service =
+      TemplateURLServiceFactory::GetForProfile(browser()->profile());
+  base::string16 default_search_keyword =
+      template_url_service->GetDefaultSearchProvider()->keyword();
+
+  base::string16 query_text = base::ASCIIToUTF16("foo");
+
+  size_t selection_start, selection_end;
+
+  // Focus search when omnibox is blank.
   {
-    EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::UTF8ToUTF16(url::kAboutBlankURL), omnibox_view->GetText());
+    FocusSearchCheckPreconditions();
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
 
-    size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
-    EXPECT_EQ(1U, selection_start);
-    EXPECT_EQ(1U, selection_end);
+    EXPECT_EQ(0U, selection_start);
+    EXPECT_EQ(0U, selection_end);
+
+    omnibox_view->RevertAll();
   }
 
   // Focus search when omnibox is _not_ alread in forced query mode.

[Peter Kasting, 2016/04/15 00:58:55]

There is no such thing as forced query mode anymore... (multiple places)

[Tom (Use chromium acct), 2016/04/15 05:20:51]

Done.

   {
-    omnibox_view->SetUserText(base::ASCIIToUTF16("foo"));
+    FocusSearchCheckPreconditions();
+
+    omnibox_view->SetUserText(query_text);
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("foo"), omnibox_view->GetText());
+    EXPECT_EQ(query_text, omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_FALSE(omnibox_model->is_keyword_selected());
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(query_text, omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
 
-    size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
-    EXPECT_EQ(1U, selection_start);
-    EXPECT_EQ(1U, selection_end);
+    EXPECT_EQ(0U, std::min(selection_start, selection_end));
+    EXPECT_EQ(query_text.length(), std::max(selection_start, selection_end));
+
+    omnibox_view->RevertAll();
   }
 
   // Focus search when omnibox _is_ already in forced query mode, but no query
   // has been typed.
   {
-    omnibox_view->SetUserText(base::ASCIIToUTF16("?"));
-    EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
+    FocusSearchCheckPreconditions();
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
 
-    size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
-    EXPECT_EQ(1U, selection_start);
-    EXPECT_EQ(1U, selection_end);
+    EXPECT_EQ(0U, selection_start);
+    EXPECT_EQ(0U, selection_end);
+
+    location_bar->FocusSearch();
+    EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
+    EXPECT_EQ(base::string16(), omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
+
+    omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
+    EXPECT_EQ(0U, selection_start);
+    EXPECT_EQ(0U, selection_end);
+
+    omnibox_view->RevertAll();
   }
 
   // Focus search when omnibox _is_ already in forced query mode, and some query
   // has been typed.
   {
-    omnibox_view->SetUserText(base::ASCIIToUTF16("?foo"));
+    FocusSearchCheckPreconditions();
+
+    omnibox_view->SetUserText(query_text);
+    location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("?foo"), omnibox_view->GetText());
+    EXPECT_EQ(query_text, omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
+
+    omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
+    EXPECT_EQ(0U, std::min(selection_start, selection_end));
+    EXPECT_EQ(query_text.length(), std::max(selection_start, selection_end));
 
     location_bar->FocusSearch();
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("?foo"), omnibox_view->GetText());
+    EXPECT_EQ(query_text, omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
 
-    size_t selection_start, selection_end;
     omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
-    EXPECT_EQ(1U, std::min(selection_start, selection_end));
-    EXPECT_EQ(4U, std::max(selection_start, selection_end));
+    EXPECT_EQ(0U, std::min(selection_start, selection_end));
+    EXPECT_EQ(query_text.length(), std::max(selection_start, selection_end));
+
+    omnibox_view->RevertAll();
   }
 
-  // Focus search when omnibox is in forced query mode with leading whitespace.
+  // If the user gets into keyword mode using a keyboard shortcut, and presses
+  // backspace, they should be left with their original query without their dsp
+  // keyword.
   {
-    omnibox_view->SetUserText(base::ASCIIToUTF16("   ?foo"));
+    FocusSearchCheckPreconditions();
+
+    omnibox_view->SetUserText(query_text);
+    // The user presses Ctrl-K.
+    location_bar->FocusSearch();
+    // The user presses backspace.
+    omnibox_model->ClearKeyword();
+
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("   ?foo"), omnibox_view->GetText());
+    EXPECT_EQ(query_text, omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_FALSE(omnibox_model->is_keyword_selected());
 
-    location_bar->FocusSearch();
+    omnibox_view->RevertAll();
+  }
+
+  // If the user gets into keyword mode by typing '?', they should be put into
+  // keyword mode for their default search provider.  If they press backspace,
+  // they should be left with '?' in the omnibox.
+  {
+    FocusSearchCheckPreconditions();
+
+    omnibox_view->SetUserText(base::ASCIIToUTF16("?"));
+
     EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
-    EXPECT_EQ(base::ASCIIToUTF16("   ?foo"), omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_view->GetText());
+    EXPECT_EQ(default_search_keyword, omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_TRUE(omnibox_model->is_keyword_selected());
 
-    size_t selection_start, selection_end;
-    omnibox_view->GetSelectionBounds(&selection_start, &selection_end);
-    EXPECT_EQ(4U, std::min(selection_start, selection_end));
-    EXPECT_EQ(7U, std::max(selection_start, selection_end));
+    // The user presses backspace.
+    omnibox_model->ClearKeyword();
+
+    EXPECT_FALSE(location_bar->GetDestinationURL().is_valid());
+    EXPECT_EQ(base::ASCIIToUTF16("?"), omnibox_view->GetText());
+    EXPECT_EQ(base::string16(), omnibox_model->keyword());
+    EXPECT_FALSE(omnibox_model->is_keyword_hint());
+    EXPECT_FALSE(omnibox_model->is_keyword_selected());
+
+    omnibox_view->RevertAll();
   }
 }