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

components/omnibox/browser/autocomplete_input_unittest.cc

 // Copyright 2014 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 "components/omnibox/browser/autocomplete_input.h"
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/metrics/proto/omnibox_input_type.pb.h"
 #include "components/omnibox/browser/test_scheme_classifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/third_party/mozilla/url_parse.h"
 
 using base::ASCIIToUTF16;
 using metrics::OmniboxEventProto;
 
 TEST(AutocompleteInputTest, InputType) {
   struct test_data {
     const base::string16 input;
     const metrics::OmniboxInputType::Type type;
   } input_cases[] = {
     { base::string16(), metrics::OmniboxInputType::INVALID },
-    { ASCIIToUTF16("?"), metrics::OmniboxInputType::FORCED_QUERY },
-    { ASCIIToUTF16("?foo"), metrics::OmniboxInputType::FORCED_QUERY },
-    { ASCIIToUTF16("?foo bar"), metrics::OmniboxInputType::FORCED_QUERY },
+    { ASCIIToUTF16("?"), metrics::OmniboxInputType::QUERY },
+    { ASCIIToUTF16("?foo"), metrics::OmniboxInputType::QUERY },
+    { ASCIIToUTF16("?foo bar"), metrics::OmniboxInputType::QUERY },
     { ASCIIToUTF16("?http://foo.com/bar"),
-      metrics::OmniboxInputType::FORCED_QUERY },
+      metrics::OmniboxInputType::QUERY },
     { ASCIIToUTF16("foo"), metrics::OmniboxInputType::UNKNOWN },
     { ASCIIToUTF16("localhost"), metrics::OmniboxInputType::URL },
     { ASCIIToUTF16("foo._"), metrics::OmniboxInputType::QUERY },
     { ASCIIToUTF16("foo.c"), metrics::OmniboxInputType::UNKNOWN },
     { ASCIIToUTF16("foo.com"), metrics::OmniboxInputType::URL },
     { ASCIIToUTF16("-foo.com"), metrics::OmniboxInputType::URL },
     { ASCIIToUTF16("foo-.com"), metrics::OmniboxInputType::URL },
     { ASCIIToUTF16("foo_.com"), metrics::OmniboxInputType::URL },
     { ASCIIToUTF16("foo.-com"), metrics::OmniboxInputType::QUERY },
     { ASCIIToUTF16("foo/"), metrics::OmniboxInputType::URL },
@@ skipping 236 matching lines @@
 TEST(AutocompleteInputTest, InputTypeWithCursorPosition) {
   struct test_data {
     const base::string16 input;
     size_t cursor_position;
     const base::string16 normalized_input;
     size_t normalized_cursor_position;
   } input_cases[] = {
     { ASCIIToUTF16("foo bar"), base::string16::npos,
       ASCIIToUTF16("foo bar"), base::string16::npos },
 
-    // regular case, no changes.
+    // Regular case, no changes.
     { ASCIIToUTF16("foo bar"), 3, ASCIIToUTF16("foo bar"), 3 },
 
-    // extra leading space.
+    // Extra leading space.
     { ASCIIToUTF16("  foo bar"), 3, ASCIIToUTF16("foo bar"), 1 },
     { ASCIIToUTF16("      foo bar"), 3, ASCIIToUTF16("foo bar"), 0 },
     { ASCIIToUTF16("      foo bar   "), 2, ASCIIToUTF16("foo bar   "), 0 },
 
-    // forced query.
-    { ASCIIToUTF16("?foo bar"), 2, ASCIIToUTF16("foo bar"), 1 },
-    { ASCIIToUTF16("  ?foo bar"), 4, ASCIIToUTF16("foo bar"), 1 },
-    { ASCIIToUTF16("?  foo bar"), 4, ASCIIToUTF16("foo bar"), 1 },
-    { ASCIIToUTF16("  ?  foo bar"), 6, ASCIIToUTF16("foo bar"), 1 },
+    // A leading '?' used to be a magic character indicating the following
+    // input should be treated as a "forced query", but now if such a string
+    // reaches the AutocompleteInput parser the '?' should just be treated like
+    // a normal character.
+    { ASCIIToUTF16("?foo bar"), 2, ASCIIToUTF16("?foo bar"), 2 },
+    { ASCIIToUTF16("  ?foo bar"), 4, ASCIIToUTF16("?foo bar"), 2 },
+    { ASCIIToUTF16("?  foo bar"), 4, ASCIIToUTF16("?  foo bar"), 4 },
+    { ASCIIToUTF16("  ?  foo bar"), 6, ASCIIToUTF16("?  foo bar"), 4 },
   };
 
   for (size_t i = 0; i < arraysize(input_cases); ++i) {
     SCOPED_TRACE(input_cases[i].input);
     AutocompleteInput input(input_cases[i].input,
                             input_cases[i].cursor_position, std::string(),
                             GURL(), OmniboxEventProto::INVALID_SPEC, true,
                             false, true, true, false, TestSchemeClassifier());
     EXPECT_EQ(input_cases[i].normalized_input, input.text());
     EXPECT_EQ(input_cases[i].normalized_cursor_position,
               input.cursor_position());
   }
 }