Make Google Search autocomplete provider cursor aware.

chrome/browser/autocomplete/autocomplete_input_unittest.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 "chrome/browser/autocomplete/autocomplete_input.h"
 
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 103 matching lines @@
     { ASCIIToUTF16("filesystem:http://a.com/t/bar"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:http:foo"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:file://"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:http"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:"), AutocompleteInput::URL },
     { ASCIIToUTF16("ftp:"), AutocompleteInput::URL },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
     SCOPED_TRACE(input_cases[i].input);
-    AutocompleteInput input(input_cases[i].input, string16(), true, false,
-                            true, AutocompleteInput::ALL_MATCHES);
+    AutocompleteInput input(input_cases[i].input, string16::npos, string16(),
+                            true, false, true, AutocompleteInput::ALL_MATCHES);
     EXPECT_EQ(input_cases[i].type, input.type());
   }
 }
 
 TEST(AutocompleteInputTest, InputTypeWithDesiredTLD) {
   struct test_data {
     const string16 input;
     const AutocompleteInput::Type type;
   } input_cases[] = {
     { ASCIIToUTF16("401k"), AutocompleteInput::REQUESTED_URL },
     { ASCIIToUTF16("999999999999999"), AutocompleteInput::REQUESTED_URL },
     { ASCIIToUTF16("x@y"), AutocompleteInput::REQUESTED_URL },
     { ASCIIToUTF16("y/z z"), AutocompleteInput::REQUESTED_URL },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
     SCOPED_TRACE(input_cases[i].input);
-    AutocompleteInput input(input_cases[i].input, ASCIIToUTF16("com"), true,
-                            false, true, AutocompleteInput::ALL_MATCHES);
+    AutocompleteInput input(input_cases[i].input, string16::npos,
+                            ASCIIToUTF16("com"), true, false, true,
+                            AutocompleteInput::ALL_MATCHES);
     EXPECT_EQ(input_cases[i].type, input.type());
   }
 }
 
 // This tests for a regression where certain input in the omnibox caused us to
 // crash. As long as the test completes without crashing, we're fine.
 TEST(AutocompleteInputTest, InputCrash) {
-  AutocompleteInput input(WideToUTF16(L"\uff65@s"), string16(), true, false,
-                          true, AutocompleteInput::ALL_MATCHES);
+  AutocompleteInput input(WideToUTF16(L"\uff65@s"), string16::npos, string16(),
+                          true, false, true, AutocompleteInput::ALL_MATCHES);
 }
 
 TEST(AutocompleteInputTest, ParseForEmphasizeComponent) {
   using url_parse::Component;
   Component kInvalidComponent(0, -1);
   struct test_data {
     const string16 input;
     const Component scheme;
     const Component host;
   } input_cases[] = {
@@ skipping 21 matching lines @@
         Component(12, 11), kInvalidComponent }
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
     SCOPED_TRACE(input_cases[i].input);
     Component scheme, host;
     AutocompleteInput::ParseForEmphasizeComponents(input_cases[i].input,
                                                    string16(),
                                                    &scheme,
                                                    &host);
-    AutocompleteInput input(input_cases[i].input, string16(), true, false,
-                            true, AutocompleteInput::ALL_MATCHES);
+    AutocompleteInput input(input_cases[i].input, string16::npos, string16(),
+                            true, false, true, AutocompleteInput::ALL_MATCHES);
     EXPECT_EQ(input_cases[i].scheme.begin, scheme.begin);
     EXPECT_EQ(input_cases[i].scheme.len, scheme.len);
     EXPECT_EQ(input_cases[i].host.begin, host.begin);
     EXPECT_EQ(input_cases[i].host.len, host.len);
   }
 }
+
+TEST(AutocompleteInputTest, InputTypeWithCursorPosition) {
+  struct test_data {
+    const string16 input;
+    size_t cursor_position;
+    const string16 normalized_input;
+    size_t normalized_cursor_position;
+  } input_cases[] = {
+    { ASCIIToUTF16("foo bar"), string16::npos,
+      ASCIIToUTF16("foo bar"), string16::npos },
+
+    // regular case, no changes.
+    { ASCIIToUTF16("foo bar"), 3, ASCIIToUTF16("foo bar"), 3 },
+
+    // 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 },
+  };
+
+  for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
+    SCOPED_TRACE(input_cases[i].input);
+    AutocompleteInput input(input_cases[i].input,
+                            input_cases[i].cursor_position,
+                            string16(), true, false, true,
+                            AutocompleteInput::ALL_MATCHES);
+    EXPECT_EQ(input_cases[i].normalized_input, input.text());
+    EXPECT_EQ(input_cases[i].normalized_cursor_position,
+              input.cursor_position());
+  }
+}