Make Google Search autocomplete provider cursor aware.

chrome/browser/autocomplete/search_provider_unittest.cc

 // Copyright 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/search_provider.h"
 
 #include "base/run_loop.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
@@ skipping 190 matching lines @@
 #else
   base::RunLoop run_loop;
   run_loop.Run();
 #endif
 }
 
 void SearchProviderTest::QueryForInput(const string16& text,
                                        const string16& desired_tld,
                                        bool prevent_inline_autocomplete) {
   // Start a query.
-  AutocompleteInput input(text, desired_tld, prevent_inline_autocomplete,
+  AutocompleteInput input(text, string16::npos, desired_tld,
+                          prevent_inline_autocomplete,
                           false, true, AutocompleteInput::ALL_MATCHES);
   provider_->Start(input, false);
 
   // RunUntilIdle so that the task scheduled by SearchProvider to create the
   // URLFetchers runs.
   message_loop_.RunUntilIdle();
 }
 
 void SearchProviderTest::QueryForInputAndSetWYTMatch(
     const string16& text,
@@ skipping 461 matching lines @@
 }
 
 // Verifies AutocompleteControllers sets descriptions for results correctly.
 TEST_F(SearchProviderTest, UpdateKeywordDescriptions) {
   // Add an entry that corresponds to a keyword search with 'term2'.
   AddSearchToHistory(keyword_t_url_, ASCIIToUTF16("term2"), 1);
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   AutocompleteController controller(&profile_, NULL,
       AutocompleteProvider::TYPE_SEARCH);
-  controller.Start(ASCIIToUTF16("k t"), string16(), false, false, true,
-                   AutocompleteInput::ALL_MATCHES);
+  controller.Start(AutocompleteInput(
+      ASCIIToUTF16("k t"), string16::npos, string16(), false, false, true,
+      AutocompleteInput::ALL_MATCHES));
   const AutocompleteResult& result = controller.result();
 
   // There should be two matches, one for the keyword one for what you typed.
   ASSERT_EQ(2u, result.size());
 
   EXPECT_FALSE(result.match_at(0).keyword.empty());
   EXPECT_FALSE(result.match_at(1).keyword.empty());
   EXPECT_NE(result.match_at(0).keyword, result.match_at(1).keyword);
 
   EXPECT_FALSE(result.match_at(0).description.empty());
@@ skipping 563 matching lines @@
   EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,
             match.contents_class[0].style);
   EXPECT_EQ(4U, match.contents_class[1].offset);
   EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL |
             AutocompleteMatch::ACMatchClassification::MATCH,
             match.contents_class[1].style);
   EXPECT_EQ(5U, match.contents_class[2].offset);
   EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,
             match.contents_class[2].style);
 }