Make Google Search autocomplete provider cursor aware.

chrome/browser/extensions/api/omnibox/omnibox_apitest.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 "base/format_macros.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
@@ skipping 65 matching lines @@
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
   LocationBar* location_bar = GetLocationBar(browser());
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(browser());
 
   // Test that our extension's keyword is suggested to us when we partially type
   // it.
   {
     autocomplete_controller->Start(
-        ASCIIToUTF16("keywor"), string16(), true, false, true,
-        AutocompleteInput::ALL_MATCHES);
+        AutocompleteInput(ASCIIToUTF16("keywor"), string16::npos, string16(),
+                          true, false, true, AutocompleteInput::ALL_MATCHES));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
     // Now, peek into the controller to see if it has the results we expect.
     // First result should be to search for what was typed, second should be to
     // enter "extension keyword" mode.
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(2U, result.size()) << AutocompleteResultAsString(result);
     AutocompleteMatch match = result.match_at(0);
     EXPECT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED, match.type);
     EXPECT_FALSE(match.deletable);
 
     match = result.match_at(1);
     EXPECT_EQ(ASCIIToUTF16("keyword"), match.keyword);
   }
 
   // Test that our extension can send suggestions back to us.
   {
     autocomplete_controller->Start(
-        ASCIIToUTF16("keyword suggestio"), string16(), true, false, true,
-        AutocompleteInput::ALL_MATCHES);
+        AutocompleteInput(ASCIIToUTF16("keyword suggestio"), string16::npos,
+                          string16(), true, false, true,
+                          AutocompleteInput::ALL_MATCHES));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
     // Now, peek into the controller to see if it has the results we expect.
     // First result should be to invoke the keyword with what we typed, 2-4
     // should be to invoke with suggestions from the extension, and the last
     // should be to search for what we typed.
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(5U, result.size()) << AutocompleteResultAsString(result);
 
@@ skipping 87 matching lines @@
 
   // Quickly type another query and accept it before getting suggestions back
   // for the query. The popup will close after accepting input - ensure that it
   // does not reopen when the extension returns its suggestions.
   ResultCatcher catcher;
 
   // TODO: Rather than send this second request by talking to the controller
   // directly, figure out how to send it via the proper calls to
   // location_bar or location_bar->().
   autocomplete_controller->Start(
-      ASCIIToUTF16("keyword command"), string16(), true, false, true,
-      AutocompleteInput::ALL_MATCHES);
+      AutocompleteInput(ASCIIToUTF16("keyword command"), string16::npos,
+                        string16(), true, false, true,
+                        AutocompleteInput::ALL_MATCHES));
   location_bar->AcceptInput();
   WaitForAutocompleteDone(autocomplete_controller);
   EXPECT_TRUE(autocomplete_controller->done());
   // This checks that the keyword provider (via javascript)
   // gets told to navigate to the string "command".
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   EXPECT_FALSE(popup_model->IsOpen());
 }
 
 // Tests that we get suggestions from and send input to the incognito context
@@ skipping 17 matching lines @@
   ui_test_utils::WaitForTemplateURLServiceToLoad(
       TemplateURLServiceFactory::GetForProfile(browser()->profile()));
 
   LocationBar* location_bar = GetLocationBar(incognito_browser);
   AutocompleteController* autocomplete_controller =
       GetAutocompleteController(incognito_browser);
 
   // Test that we get the incognito-specific suggestions.
   {
     autocomplete_controller->Start(
-        ASCIIToUTF16("keyword suggestio"), string16(), true, false, true,
-        AutocompleteInput::ALL_MATCHES);
+        AutocompleteInput(ASCIIToUTF16("keyword suggestio"), string16::npos,
+                          string16(), true, false, true,
+                          AutocompleteInput::ALL_MATCHES));
     WaitForAutocompleteDone(autocomplete_controller);
     EXPECT_TRUE(autocomplete_controller->done());
 
     // First result should be to invoke the keyword with what we typed, 2-4
     // should be to invoke with suggestions from the extension, and the last
     // should be to search for what we typed.
     const AutocompleteResult& result = autocomplete_controller->result();
     ASSERT_EQ(5U, result.size()) << AutocompleteResultAsString(result);
     ASSERT_FALSE(result.match_at(0).keyword.empty());
     EXPECT_EQ(ASCIIToUTF16("keyword suggestion3 incognito"),
               result.match_at(3).fill_into_edit);
   }
 
   // Test that our input is sent to the incognito context. The test will do a
   // text comparison and succeed only if "command incognito" is sent to the
   // incognito context.
   {
     ResultCatcher catcher;
     autocomplete_controller->Start(
-        ASCIIToUTF16("keyword command incognito"), string16(),
-        true, false, true, AutocompleteInput::ALL_MATCHES);
+        AutocompleteInput(ASCIIToUTF16("keyword command incognito"),
+                          string16::npos, string16(), true, false, true,
+                          AutocompleteInput::ALL_MATCHES));
     location_bar->AcceptInput();
     EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   }
 }