Omnibox: Change |inline_autocomplete_offset| to |inline_autocompletion|

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/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/prefs/pref_service.h"
 #include "base/run_loop.h"
@@ skipping 648 matching lines @@
   GURL term_url(AddSearchToHistory(default_t_url_, ASCIIToUTF16("FOO"), 1));
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   AutocompleteMatch wyt_match;
   ASSERT_NO_FATAL_FAILURE(QueryForInputAndSetWYTMatch(ASCIIToUTF16("f"),
                                                       &wyt_match));
   ASSERT_EQ(2u, provider_->matches().size());
   AutocompleteMatch term_match;
   EXPECT_TRUE(FindMatchWithDestination(term_url, &term_match));
   EXPECT_GT(term_match.relevance, wyt_match.relevance);
-  EXPECT_EQ(1u, term_match.inline_autocomplete_offset);
   EXPECT_EQ(ASCIIToUTF16("FOO"), term_match.fill_into_edit);
+  EXPECT_EQ(ASCIIToUTF16("OO"), term_match.inline_autocompletion);
 }
 
 // Verifies AutocompleteControllers return results (including keyword
 // results) in the right order and set descriptions for them correctly.
 TEST_F(SearchProviderTest, KeywordOrderingAndDescriptions) {
   // Add an entry that corresponds to a keyword search with 'term2'.
   AddSearchToHistory(keyword_t_url_, ASCIIToUTF16("term2"), 1);
   profile_.BlockUntilHistoryProcessesPendingRequests();
 
   AutocompleteController controller(&profile_, NULL,
@@ skipping 207 matching lines @@
 }
 
 // Verifies that suggest results with relevance scores are added
 // properly when using the default fetcher.  When adding a new test
 // case to this test, please consider adding it to the tests in
 // KeywordFetcherSuggestRelevance below.
 TEST_F(SearchProviderTest, DefaultFetcherSuggestRelevance) {
   struct {
     const std::string json;
     const std::string matches[4];
+    const std::string inline_autocompletion;
   } cases[] = {
     // Ensure that suggestrelevance scores reorder matches.
     { "[\"a\",[\"b\", \"c\"],[],[],{\"google:suggestrelevance\":[1, 2]}]",
-      { "a", "c", "b", kNotApplicable } },
+      { "a", "c", "b", kNotApplicable }, "" },

[Peter Kasting, 2013/07/16 18:09:05]

Nit: If we're constructing a string from this instead of a char[] or similar, I
generally try to stay in the habit of using std::string() as the initializer
instead of "".

[Mark P, 2013/07/16 18:53:23]

Done everywhere, though I think it looks a little silly going back and forth
between std::string() and "1" all the time.  "" vs "1" looks a lot saner.

     { "[\"a\",[\"http://b.com\", \"http://c.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1, 2]}]",
-      { "a", "c.com", "b.com", kNotApplicable } },
+      { "a", "c.com", "b.com", kNotApplicable }, "" },
 
     // Without suggested relevance scores, we should only allow one
     // navsuggest result to be be displayed.
     { "[\"a\",[\"http://b.com\", \"http://c.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"]}]",
-      { "a", "b.com", kNotApplicable, kNotApplicable } },
+      { "a", "b.com", kNotApplicable, kNotApplicable }, "" },
 
     // Ensure that verbatimrelevance scores reorder or suppress verbatim.
     // Negative values will have no effect; the calculated value will be used.
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":9999,"
                              "\"google:suggestrelevance\":[9998]}]",
-      { "a", "a1", kNotApplicable, kNotApplicable } },
+      { "a", "a1", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":9998,"
                              "\"google:suggestrelevance\":[9999]}]",
-      { "a1", "a", kNotApplicable, kNotApplicable } },
+      { "a1", "a", kNotApplicable, kNotApplicable }, "1" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":0,"
                              "\"google:suggestrelevance\":[9999]}]",
-      { "a1", kNotApplicable, kNotApplicable, kNotApplicable } },
+      { "a1", kNotApplicable, kNotApplicable, kNotApplicable }, "1" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":-1,"
                              "\"google:suggestrelevance\":[9999]}]",
-      { "a1", "a", kNotApplicable, kNotApplicable } },
+      { "a1", "a", kNotApplicable, kNotApplicable }, "1" },
     { "[\"a\",[\"http://a.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:verbatimrelevance\":9999,"
         "\"google:suggestrelevance\":[9998]}]",
-      { "a", "a.com", kNotApplicable, kNotApplicable } },
+      { "a", "a.com", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"http://a.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:verbatimrelevance\":9998,"
         "\"google:suggestrelevance\":[9999]}]",
-      { "a.com", "a", kNotApplicable, kNotApplicable } },
+      { "a.com", "a", kNotApplicable, kNotApplicable }, ".com" },
     { "[\"a\",[\"http://a.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:verbatimrelevance\":0,"
         "\"google:suggestrelevance\":[9999]}]",
-      { "a.com", kNotApplicable, kNotApplicable, kNotApplicable } },
+      { "a.com", kNotApplicable, kNotApplicable, kNotApplicable }, ".com" },
     { "[\"a\",[\"http://a.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:verbatimrelevance\":-1,"
         "\"google:suggestrelevance\":[9999]}]",
-      { "a.com", "a", kNotApplicable, kNotApplicable } },
+      { "a.com", "a", kNotApplicable, kNotApplicable }, ".com" },
 
     // Ensure that both types of relevance scores reorder matches together.
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[9999, 9997],"
                                      "\"google:verbatimrelevance\":9998}]",
-      { "a1", "a", "a2", kNotApplicable } },
+      { "a1", "a", "a2", kNotApplicable }, "1" },
 
     // Ensure that only inlinable matches may be ranked as the highest result.
     // Ignore all suggested relevance scores if this constraint is violated.
     { "[\"a\",[\"b\"],[],[],{\"google:suggestrelevance\":[9999]}]",
-      { "a", "b", kNotApplicable, kNotApplicable } },
+      { "a", "b", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"b\"],[],[],{\"google:suggestrelevance\":[9999],"
                             "\"google:verbatimrelevance\":0}]",
-      { "a", "b", kNotApplicable, kNotApplicable } },
+      { "a", "b", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"http://b.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[9999]}]",
-      { "a", "b.com", kNotApplicable, kNotApplicable } },
+      { "a", "b.com", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"http://b.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[9999],"
         "\"google:verbatimrelevance\":0}]",
-      { "a", "b.com", kNotApplicable, kNotApplicable } },
+      { "a", "b.com", kNotApplicable, kNotApplicable }, "" },
 
     // Ensure that the top result is ranked as highly as calculated verbatim.
     // Ignore the suggested verbatim relevance if this constraint is violated.
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":0}]",
-      { "a", "a1", kNotApplicable, kNotApplicable } },
+      { "a", "a1", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":1}]",
-      { "a", "a1", kNotApplicable, kNotApplicable } },
+      { "a", "a1", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:suggestrelevance\":[1],"
                              "\"google:verbatimrelevance\":0}]",
-      { "a", "a1", kNotApplicable, kNotApplicable } },
+      { "a", "a1", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[1, 2],"
                                      "\"google:verbatimrelevance\":0}]",
-      { "a", "a2", "a1", kNotApplicable } },
+      { "a", "a2", "a1", kNotApplicable }, "" },
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[1, 3],"
       "\"google:verbatimrelevance\":2}]",
-      { "a", "a2", "a1", kNotApplicable } },
+      { "a", "a2", "a1", kNotApplicable }, "" },
     { "[\"a\",[\"http://a.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1],"
         "\"google:verbatimrelevance\":0}]",
-      { "a", "a.com", kNotApplicable, kNotApplicable } },
+      { "a", "a.com", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1, 2],"
         "\"google:verbatimrelevance\":0}]",
-      { "a", "a2.com", "a1.com", kNotApplicable } },
+      { "a", "a2.com", "a1.com", kNotApplicable }, "" },
 
     // Ensure that all suggestions are considered, regardless of order.
     { "[\"a\",[\"b\", \"c\", \"d\", \"e\", \"f\", \"g\", \"h\"],[],[],"
        "{\"google:suggestrelevance\":[1, 2, 3, 4, 5, 6, 7]}]",
-      { "a", "h", "g", "f" } },
+      { "a", "h", "g", "f" }, "" },
     { "[\"a\",[\"http://b.com\", \"http://c.com\", \"http://d.com\","
               "\"http://e.com\", \"http://f.com\", \"http://g.com\","
               "\"http://h.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\","
                                 "\"NAVIGATION\", \"NAVIGATION\","
                                 "\"NAVIGATION\", \"NAVIGATION\","
                                 "\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1, 2, 3, 4, 5, 6, 7]}]",
-      { "a", "h.com", "g.com", "f.com" } },
+      { "a", "h.com", "g.com", "f.com" }, "" },
 
     // Ensure that incorrectly sized suggestion relevance lists are ignored.
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[1]}]",
-      { "a", "a1", "a2", kNotApplicable } },
+      { "a", "a1", "a2", kNotApplicable }, "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:suggestrelevance\":[9999, 1]}]",
-      { "a", "a1", kNotApplicable, kNotApplicable } },
+      { "a", "a1", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1]}]",
-      { "a", "a1.com", kNotApplicable, kNotApplicable } },
+      { "a", "a1.com", kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[\"http://a1.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
        "\"google:suggestrelevance\":[9999, 1]}]",
-      { "a", "a1.com", kNotApplicable, kNotApplicable } },
+      { "a", "a1.com", kNotApplicable, kNotApplicable }, "" },
 
     // Ensure that all 'verbatim' results are merged with their maximum score.
     { "[\"a\",[\"a\", \"a1\", \"a2\"],[],[],"
        "{\"google:suggestrelevance\":[9998, 9997, 9999]}]",
-      { "a2", "a", "a1", kNotApplicable } },
+      { "a2", "a", "a1", kNotApplicable }, "2" },
     { "[\"a\",[\"a\", \"a1\", \"a2\"],[],[],"
        "{\"google:suggestrelevance\":[9998, 9997, 9999],"
         "\"google:verbatimrelevance\":0}]",
-      { "a2", "a", "a1", kNotApplicable } },
+      { "a2", "a", "a1", kNotApplicable }, "2" },
 
     // Ensure that verbatim is always generated without other suggestions.
     // TODO(msw): Ensure verbatimrelevance is respected (except suppression).
     { "[\"a\",[],[],[],{\"google:verbatimrelevance\":1}]",
-      { "a", kNotApplicable, kNotApplicable, kNotApplicable } },
+      { "a", kNotApplicable, kNotApplicable, kNotApplicable }, "" },
     { "[\"a\",[],[],[],{\"google:verbatimrelevance\":0}]",
-      { "a", kNotApplicable, kNotApplicable, kNotApplicable } },
+      { "a", kNotApplicable, kNotApplicable, kNotApplicable }, "" },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     QueryForInput(ASCIIToUTF16("a"), false, false);
     net::TestURLFetcher* fetcher = WaitUntilURLFetcherIsReady(
         SearchProvider::kDefaultProviderURLFetcherID);
     ASSERT_TRUE(fetcher);
     fetcher->set_response_code(200);
     fetcher->SetResponseString(cases[i].json);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
     RunTillProviderDone();
 
     const std::string description = "for input with json=" + cases[i].json;
     const ACMatches& matches = provider_->matches();
     // The top match must inline and score as highly as calculated verbatim.
     ASSERT_FALSE(matches.empty());
-    EXPECT_NE(string16::npos, matches[0].inline_autocomplete_offset) <<
-        description;
+    EXPECT_EQ(ASCIIToUTF16(cases[i].inline_autocompletion),
+              matches[0].inline_autocompletion) << description;
     EXPECT_GE(matches[0].relevance, 1300) << description;
 
     size_t j = 0;
     // Ensure that the returned matches equal the expectations.
     for (; j < matches.size(); ++j)
       EXPECT_EQ(ASCIIToUTF16(cases[i].matches[j]),
                 matches[j].contents) << description;
     // Ensure that no expected matches are missing.
     for (; j < ARRAYSIZE_UNSAFE(cases[i].matches); ++j)
       EXPECT_EQ(kNotApplicable, cases[i].matches[j]) <<
           "Case # " << i << " " << description;
   }
 }
 
 // Verifies that suggest results with relevance scores are added
 // properly when using the keyword fetcher.  This is similar to the
 // test DefaultFetcherSuggestRelevance above but this uses inputs that
 // trigger keyword suggestions (i.e., "k a" rather than "a") and has
 // different expectations (because now the results are a mix of
 // keyword suggestions and default provider suggestions).  When a new
 // test is added to this TEST_F, please consider if it would be
 // appropriate to add to DefaultFetcherSuggestRelevance as well.
 TEST_F(SearchProviderTest, KeywordFetcherSuggestRelevance) {
   struct {
     const std::string json;
     const struct {
       const std::string contents;
       const bool from_keyword;
     } matches[5];
+    const std::string inline_autocompletion;
   } cases[] = {
     // Ensure that suggest relevance scores reorder matches and that
     // the keyword verbatim (lacking a suggested verbatim score) beats
     // the default provider verbatim.
     { "[\"a\",[\"b\", \"c\"],[],[],{\"google:suggestrelevance\":[1, 2]}]",
       { { "a", true },
         { "k a", false },
         { "c", true },
         { "b", true },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     // Again, check that relevance scores reorder matches, just this
     // time with navigation matches.  This also checks that with
     // suggested relevance scores we allow multiple navsuggest results.
     // It's odd that navsuggest results that come from a keyword
     // provider are marked as not a keyword result.  I think this
     // comes from them not going to a keyword search engine).
     // TODO(mpearson): Investigate the implications (if any) of
     // tagging these results appropriately.  If so, do it because it
     // makes more sense.
     { "[\"a\",[\"http://b.com\", \"http://c.com\", \"d\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
        "\"google:suggestrelevance\":[1301, 1302, 1303]}]",
       { { "a", true },
         { "d", true },
         { "c.com", false },
         { "b.com", false },
-        { "k a", false }, } },
+        { "k a", false }, },
+      "" },
 
     // Without suggested relevance scores, we should only allow one
     // navsuggest result to be be displayed.
     { "[\"a\",[\"http://b.com\", \"http://c.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"]}]",
       { { "a", true },
         { "b.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
 
     // Ensure that verbatimrelevance scores reorder or suppress verbatim.
     // Negative values will have no effect; the calculated value will be used.
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":9999,"
                              "\"google:suggestrelevance\":[9998]}]",
       { { "a", true },
         { "a1", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":9998,"
                              "\"google:suggestrelevance\":[9999]}]",
       { { "a1", true },
         { "a", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "1" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":0,"
                              "\"google:suggestrelevance\":[9999]}]",
       { { "a1", true },
         { "k a", false },
         { kNotApplicable, false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "1" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":-1,"
                              "\"google:suggestrelevance\":[9999]}]",
       { { "a1", true },
         { "a", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "1" },
     { "[\"a\",[\"http://a.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:verbatimrelevance\":9999,"
         "\"google:suggestrelevance\":[9998]}]",
       { { "a", true },
         { "a.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
 
     // Ensure that both types of relevance scores reorder matches together.
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[9999, 9997],"
                                      "\"google:verbatimrelevance\":9998}]",
       { { "a1", true },
         { "a", true },
         { "a2", true },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "1" },
 
     // Ensure that only inlinable matches may be ranked as the highest result.
     // Ignore all suggested relevance scores if this constraint is violated.
     { "[\"a\",[\"b\"],[],[],{\"google:suggestrelevance\":[9999]}]",
       { { "a", true },
         { "b", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"b\"],[],[],{\"google:suggestrelevance\":[9999],"
                             "\"google:verbatimrelevance\":0}]",
       { { "a", true },
         { "b", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"http://b.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[9999]}]",
       { { "a", true },
         { "b.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"http://b.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[9999],"
         "\"google:verbatimrelevance\":0}]",
       { { "a", true },
         { "b.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
 
     // Ensure that the top result is ranked as highly as calculated verbatim.
     // Ignore the suggested verbatim relevance if this constraint is violated.
     // Note that keyword suggestions by default (not in suggested relevance
     // mode) score more highly than the default verbatim.
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":0}]",
       { { "a", true },
         { "a1", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:verbatimrelevance\":1}]",
       { { "a", true },
         { "a1", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     // Continuing the same category of tests, but make sure we keep the
     // suggested relevance scores even as we discard the verbatim relevance
     // scores.
     { "[\"a\",[\"a1\"],[],[],{\"google:suggestrelevance\":[1],"
                              "\"google:verbatimrelevance\":0}]",
       { { "a", true },
         { "k a", false },
         { "a1", true },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[1, 2],"
                                      "\"google:verbatimrelevance\":0}]",
       { { "a", true },
         { "k a", false },
         { "a2", true },
         { "a1", true },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[1, 3],"
       "\"google:verbatimrelevance\":2}]",
       { { "a", true },
         { "k a", false },
         { "a2", true },
         { "a1", true },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
 
     // Ensure that all suggestions are considered, regardless of order.
     { "[\"a\",[\"b\", \"c\", \"d\", \"e\", \"f\", \"g\", \"h\"],[],[],"
        "{\"google:suggestrelevance\":[1, 2, 3, 4, 5, 6, 7]}]",
       { { "a", true },
         { "k a", false },
         { "h", true },
         { "g", true },
-        { "f", true } } },
+        { "f", true } },
+      "" },
     { "[\"a\",[\"http://b.com\", \"http://c.com\", \"http://d.com\","
               "\"http://e.com\", \"http://f.com\", \"http://g.com\","
               "\"http://h.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\","
                                 "\"NAVIGATION\", \"NAVIGATION\","
                                 "\"NAVIGATION\", \"NAVIGATION\","
                                 "\"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1, 2, 3, 4, 5, 6, 7]}]",
       { { "a", true },
         { "k a", false },
         { "h.com", false },
         { "g.com", false },
-        { "f.com", false } } },
+        { "f.com", false } },
+      "" },
 
     // Ensure that incorrectly sized suggestion relevance lists are ignored.
     // Note that keyword suggestions by default (not in suggested relevance
     // mode) score more highly than the default verbatim.
     { "[\"a\",[\"a1\", \"a2\"],[],[],{\"google:suggestrelevance\":[1]}]",
       { { "a", true },
         { "a1", true },
         { "a2", true },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"a1\"],[],[],{\"google:suggestrelevance\":[9999, 1]}]",
       { { "a", true },
         { "a1", true },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     // In this case, ignored the suggested relevance scores means we keep
     // only one navsuggest result.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:suggestrelevance\":[1]}]",
       { { "a", true },
         { "a1.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"http://a1.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\"],"
        "\"google:suggestrelevance\":[9999, 1]}]",
       { { "a", true },
         { "a1.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
 
     // Ensure that all 'verbatim' results are merged with their maximum score.
     { "[\"a\",[\"a\", \"a1\", \"a2\"],[],[],"
        "{\"google:suggestrelevance\":[9998, 9997, 9999]}]",
       { { "a2", true },
         { "a", true },
         { "a1", true },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "2" },
     { "[\"a\",[\"a\", \"a1\", \"a2\"],[],[],"
        "{\"google:suggestrelevance\":[9998, 9997, 9999],"
         "\"google:verbatimrelevance\":0}]",
       { { "a2", true },
         { "a", true },
         { "a1", true },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "2" },
 
     // Ensure that verbatim is always generated without other suggestions.
     // TODO(mpearson): Ensure the value of verbatimrelevance is respected
     // (except when suggested relevances are ignored).
     { "[\"a\",[],[],[],{\"google:verbatimrelevance\":1}]",
       { { "a", true },
         { "k a", false },
         { kNotApplicable, false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[],[],[],{\"google:verbatimrelevance\":0}]",
       { { "a", true },
         { "k a", false },
         { kNotApplicable, false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
 
     // Check that navsuggestions will be demoted below queries.
     // (Navsuggestions are not allowed to appear first.)  In the process,
     // make sure the navsuggestions still remain in the same order.
     // First, check the situation where navsuggest scores more than verbatim
     // and there are no query suggestions.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9998, 9999]}]",
       { { "a", true },
         { "a2.com", false },
         { "a1.com", false },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9999, 9998]}]",
       { { "a", true },
         { "a1.com", false },
         { "a2.com", false },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     // Check when navsuggest scores more than verbatim and there is query
     // suggestion but it scores lower.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9998, 9999, 1300]}]",
       { { "a", true },
         { "a2.com", false },
         { "a1.com", false },
         { "a3", true },
-        { "k a", false } } },
+        { "k a", false } },
+      "" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9999, 9998, 1300]}]",
       { { "a", true },
         { "a1.com", false },
         { "a2.com", false },
         { "a3", true },
-        { "k a", false } } },
+        { "k a", false } },
+      "" },
     // Check when navsuggest scores more than a query suggestion.  There is
     // a verbatim but it scores lower.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9998, 9999, 9997]}]",
       { { "a3", true },
         { "a2.com", false },
         { "a1.com", false },
         { "a", true },
-        { "k a", false } } },
+        { "k a", false } },
+      "3" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9999, 9998, 9997]}]",
       { { "a3", true },
         { "a1.com", false },
         { "a2.com", false },
         { "a", true },
-        { "k a", false } } },
+        { "k a", false } },
+      "3" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":0,"
         "\"google:suggestrelevance\":[9998, 9999, 9997]}]",
       { { "a3", true },
         { "a2.com", false },
         { "a1.com", false },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "3" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":0,"
         "\"google:suggestrelevance\":[9999, 9998, 9997]}]",
       { { "a3", true },
         { "a1.com", false },
         { "a2.com", false },
         { "k a", false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "3" },
     // Check when there is neither verbatim nor a query suggestion that,
     // because we can't demote navsuggestions below a query suggestion,
     // we abandon suggested relevance scores entirely.  One consequence is
     // that this means we restore the keyword verbatim match.  Note
     // that in this case of abandoning suggested relevance scores, we still
     // keep the navsuggestions in the same order, but we revert to only allowing
     // one navigation to appear because the scores are completely local.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:verbatimrelevance\":0,"
         "\"google:suggestrelevance\":[9998, 9999]}]",
       { { "a", true },
         { "a2.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\"],"
         "\"google:verbatimrelevance\":0,"
         "\"google:suggestrelevance\":[9999, 9998]}]",
       { { "a", true },
         { "a1.com", false },
         { "k a", false },
         { kNotApplicable, false },
-        { kNotApplicable, false } } },
+        { kNotApplicable, false } },
+      "" },
     // More checks that everything works when it's not necessary to demote.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9997, 9998, 9999]}]",
       { { "a3", true },
         { "a2.com", false },
         { "a1.com", false },
         { "a", true },
-        { "k a", false } } },
+        { "k a", false } },
+      "3" },
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
        "{\"google:suggesttype\":[\"NAVIGATION\", \"NAVIGATION\", \"QUERY\"],"
         "\"google:verbatimrelevance\":9990,"
         "\"google:suggestrelevance\":[9998, 9997, 9999]}]",
       { { "a3", true },
         { "a1.com", false },
         { "a2.com", false },
         { "a", true },
-        { "k a", false } } },
+        { "k a", false } },
+      "3" },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     QueryForInput(ASCIIToUTF16("k a"), false, true);
 
     // Set up a default fetcher with no results.
     net::TestURLFetcher* default_fetcher = WaitUntilURLFetcherIsReady(
         SearchProvider::kDefaultProviderURLFetcherID);
     ASSERT_TRUE(default_fetcher);
     default_fetcher->set_response_code(200);
     default_fetcher->delegate()->OnURLFetchComplete(default_fetcher);
     default_fetcher = NULL;
 
     // Set up a keyword fetcher with provided results.
     net::TestURLFetcher* keyword_fetcher = WaitUntilURLFetcherIsReady(
         SearchProvider::kKeywordProviderURLFetcherID);
     ASSERT_TRUE(keyword_fetcher);
     keyword_fetcher->set_response_code(200);
     keyword_fetcher->SetResponseString(cases[i].json);
     keyword_fetcher->delegate()->OnURLFetchComplete(keyword_fetcher);
     keyword_fetcher = NULL;
     RunTillProviderDone();
 
     const std::string description = "for input with json=" + cases[i].json;
     const ACMatches& matches = provider_->matches();
     // The top match must inline and score as highly as calculated verbatim.
     ASSERT_FALSE(matches.empty());
-    EXPECT_NE(string16::npos, matches[0].inline_autocomplete_offset) <<
-        description;
+    EXPECT_EQ(ASCIIToUTF16(cases[i].inline_autocompletion),
+              matches[0].inline_autocompletion) << description;
     EXPECT_GE(matches[0].relevance, 1300) << description;
 
     size_t j = 0;
     // Ensure that the returned matches equal the expectations.
     for (; j < matches.size(); ++j) {
       EXPECT_EQ(ASCIIToUTF16(cases[i].matches[j].contents),
                 matches[j].contents) << description;
       EXPECT_EQ(cases[i].matches[j].from_keyword,
                 matches[j].keyword == ASCIIToUTF16("k")) << description;
     }
@@ skipping 250 matching lines @@
 }
 
 // Verifies inline autocompletion of navigational results.
 TEST_F(SearchProviderTest, NavigationInline) {
   struct {
     const std::string input;
     const std::string url;
     // Test the expected fill_into_edit, which may drop "http://".
     // Some cases do not trim "http://" to match from the start of the scheme.
     const std::string fill_into_edit;
-    size_t inline_offset;
+    const std::string inline_autocompletion;
   } cases[] = {
     // Do not inline matches that do not contain the input; trim http as needed.
     { "x",                    "http://www.abc.com",
-                                     "www.abc.com",  string16::npos },
+                                     "www.abc.com",  "" },
     { "https:",               "http://www.abc.com",
-                                     "www.abc.com",  string16::npos },
+                                     "www.abc.com",  "" },
     { "abc.com/",             "http://www.abc.com",
-                                     "www.abc.com",  string16::npos },
+                                     "www.abc.com",  "" },
     { "http://www.abc.com/a", "http://www.abc.com",
-                              "http://www.abc.com",  string16::npos },
+                              "http://www.abc.com",  "" },
     { "http://www.abc.com",   "https://www.abc.com",
-                              "https://www.abc.com", string16::npos },
+                              "https://www.abc.com", "" },
     { "http://abc.com",       "ftp://abc.com",
-                              "ftp://abc.com",       string16::npos },
+                              "ftp://abc.com",       "" },
     { "https://www.abc.com",  "http://www.abc.com",
-                                     "www.abc.com",  string16::npos },
+                                     "www.abc.com",  "" },
     { "ftp://abc.com",        "http://abc.com",
-                                     "abc.com",      string16::npos },
+                                     "abc.com",      "" },
 
     // Do not inline matches with invalid input prefixes; trim http as needed.
     { "ttp",                  "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
     { "://w",                 "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
     { "ww.",                  "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
     { ".ab",                  "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
     { "bc",                   "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
     { ".com",                 "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
 
     // Do not inline matches that omit input domain labels; trim http as needed.
     { "www.a",                "http://a.com",
-                                     "a.com",       string16::npos },
+                                     "a.com",       "" },
     { "http://www.a",         "http://a.com",
-                              "http://a.com",       string16::npos },
+                              "http://a.com",       "" },
     { "www.a",                "ftp://a.com",
-                              "ftp://a.com",        string16::npos },
+                              "ftp://a.com",        "" },
     { "ftp://www.a",          "ftp://a.com",
-                              "ftp://a.com",        string16::npos },
+                              "ftp://a.com",        "" },
 
     // Input matching but with nothing to inline will not yield an offset.
     { "abc.com",              "http://www.abc.com",
-                                     "www.abc.com", string16::npos },
+                                     "www.abc.com", "" },
     { "http://www.abc.com",   "http://www.abc.com",
-                              "http://www.abc.com", string16::npos },
+                              "http://www.abc.com", "" },
 
     // Inline matches when the input is a leading substring of the scheme.
     { "h",                    "http://www.abc.com",
-                              "http://www.abc.com", 1 },
+                              "http://www.abc.com", "ttp://www.abc.com" },
     { "http",                 "http://www.abc.com",
-                              "http://www.abc.com", 4 },
+                              "http://www.abc.com", "://www.abc.com" },
 
     // Inline matches when the input is a leading substring of the full URL.
     { "http:",                "http://www.abc.com",
-                              "http://www.abc.com", 5 },
+                              "http://www.abc.com", "//www.abc.com" },
     { "http://w",             "http://www.abc.com",
-                              "http://www.abc.com", 8 },
+                              "http://www.abc.com", "ww.abc.com" },
     { "http://www.",          "http://www.abc.com",
-                              "http://www.abc.com", 11 },
+                              "http://www.abc.com", "abc.com" },
     { "http://www.ab",        "http://www.abc.com",
-                              "http://www.abc.com", 13 },
+                              "http://www.abc.com", "c.com" },
     { "http://www.abc.com/p", "http://www.abc.com/path/file.htm?q=x#foo",
-                              "http://www.abc.com/path/file.htm?q=x#foo", 20 },
+                              "http://www.abc.com/path/file.htm?q=x#foo",
+                                                  "ath/file.htm?q=x#foo" },
     { "http://abc.com/p",     "http://abc.com/path/file.htm?q=x#foo",
-                              "http://abc.com/path/file.htm?q=x#foo",     16 },
+                              "http://abc.com/path/file.htm?q=x#foo",
+                                              "ath/file.htm?q=x#foo"},
 
     // Inline matches with valid URLPrefixes; only trim "http://".
     { "w",                    "http://www.abc.com",
-                                     "www.abc.com", 1 },
+                                     "www.abc.com", "ww.abc.com" },
     { "www.a",                "http://www.abc.com",
-                                     "www.abc.com", 5 },
+                                     "www.abc.com", "bc.com" },
     { "abc",                  "http://www.abc.com",
-                                     "www.abc.com", 7 },
+                                     "www.abc.com", ".com" },
     { "abc.c",                "http://www.abc.com",
-                                     "www.abc.com", 9 },
+                                     "www.abc.com", "om" },
     { "abc.com/p",            "http://www.abc.com/path/file.htm?q=x#foo",
-                                     "www.abc.com/path/file.htm?q=x#foo", 13 },
+                                     "www.abc.com/path/file.htm?q=x#foo",
+                                                  "ath/file.htm?q=x#foo" },
     { "abc.com/p",            "http://abc.com/path/file.htm?q=x#foo",
-                                     "abc.com/path/file.htm?q=x#foo",     9 },
+                                     "abc.com/path/file.htm?q=x#foo",
+                                              "ath/file.htm?q=x#foo" },
 
     // Inline matches using the maximal URLPrefix components.
     { "h",                    "http://help.com",
-                                     "help.com",     1 },
+                                     "help.com", "elp.com" },
     { "http",                 "http://http.com",
-                                     "http.com",     4 },
+                                     "http.com", ".com" },
     { "h",                    "http://www.help.com",
-                                     "www.help.com", 5 },
+                                     "www.help.com", "elp.com" },
     { "http",                 "http://www.http.com",
-                                     "www.http.com", 8 },
+                                     "www.http.com", ".com" },
     { "w",                    "http://www.www.com",
-                                     "www.www.com",  5 },
+                                     "www.www.com",  "ww.com" },
 
     // Test similar behavior for the ftp and https schemes.
     { "ftp://www.ab",         "ftp://www.abc.com/path/file.htm?q=x#foo",
-                              "ftp://www.abc.com/path/file.htm?q=x#foo",   12 },
+                              "ftp://www.abc.com/path/file.htm?q=x#foo",
+                                          "c.com/path/file.htm?q=x#foo" },
     { "www.ab",               "ftp://www.abc.com/path/file.htm?q=x#foo",
-                              "ftp://www.abc.com/path/file.htm?q=x#foo",   12 },
+                              "ftp://www.abc.com/path/file.htm?q=x#foo",
+                                          "c.com/path/file.htm?q=x#foo" },
     { "ab",                   "ftp://www.abc.com/path/file.htm?q=x#foo",
-                              "ftp://www.abc.com/path/file.htm?q=x#foo",   12 },
+                              "ftp://www.abc.com/path/file.htm?q=x#foo",
+                                          "c.com/path/file.htm?q=x#foo" },
     { "ab",                   "ftp://abc.com/path/file.htm?q=x#foo",
-                              "ftp://abc.com/path/file.htm?q=x#foo",       8 },
+                              "ftp://abc.com/path/file.htm?q=x#foo",
+                                      "c.com/path/file.htm?q=x#foo" },
     { "https://www.ab",       "https://www.abc.com/path/file.htm?q=x#foo",
-                              "https://www.abc.com/path/file.htm?q=x#foo", 14 },
+                              "https://www.abc.com/path/file.htm?q=x#foo",
+                                            "c.com/path/file.htm?q=x#foo" },
     { "www.ab",               "https://www.abc.com/path/file.htm?q=x#foo",
-                              "https://www.abc.com/path/file.htm?q=x#foo", 14 },
+                              "https://www.abc.com/path/file.htm?q=x#foo",
+                                            "c.com/path/file.htm?q=x#foo" },
     { "ab",                   "https://www.abc.com/path/file.htm?q=x#foo",
-                              "https://www.abc.com/path/file.htm?q=x#foo", 14 },
+                              "https://www.abc.com/path/file.htm?q=x#foo",
+                                            "c.com/path/file.htm?q=x#foo" },
     { "ab",                   "https://abc.com/path/file.htm?q=x#foo",
-                              "https://abc.com/path/file.htm?q=x#foo",     10 },
+                              "https://abc.com/path/file.htm?q=x#foo",
+                                        "c.com/path/file.htm?q=x#foo"},
 
     // Forced query input should inline and retain the "?" prefix.
     { "?http://www.ab",       "http://www.abc.com",
-                             "?http://www.abc.com", 14 },
+                             "?http://www.abc.com", "c.com" },
     { "?www.ab",              "http://www.abc.com",
-                                    "?www.abc.com", 7 },
+                                    "?www.abc.com", "c.com" },
     { "?ab",                  "http://www.abc.com",
-                                    "?www.abc.com", 7 },
+                                    "?www.abc.com", "c.com" },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
     QueryForInput(ASCIIToUTF16(cases[i].input), false, false);
     AutocompleteMatch match(
         provider_->NavigationToMatch(SearchProvider::NavigationResult(
             *provider_.get(), GURL(cases[i].url), string16(), false, 0,
             false)));
-    EXPECT_EQ(cases[i].inline_offset, match.inline_autocomplete_offset);
+    EXPECT_EQ(ASCIIToUTF16(cases[i].inline_autocompletion),
+              match.inline_autocompletion);
     EXPECT_EQ(ASCIIToUTF16(cases[i].fill_into_edit), match.fill_into_edit);
   }
 }
 
 // Verifies that "http://" is not trimmed for input that is a leading substring.
 TEST_F(SearchProviderTest, NavigationInlineSchemeSubstring) {
   const string16 input(ASCIIToUTF16("ht"));
   const string16 url(ASCIIToUTF16("http://a.com"));
   const SearchProvider::NavigationResult result(
       *provider_.get(), GURL(url), string16(), false, 0, false);
 
   // Check the offset and strings when inline autocompletion is allowed.
   QueryForInput(input, false, false);
   AutocompleteMatch match_inline(provider_->NavigationToMatch(result));
-  EXPECT_EQ(2U, match_inline.inline_autocomplete_offset);
   EXPECT_EQ(url, match_inline.fill_into_edit);
+  EXPECT_EQ(url.substr(2), match_inline.inline_autocompletion);
   EXPECT_EQ(url, match_inline.contents);
 
   // Check the same offset and strings when inline autocompletion is prevented.
   QueryForInput(input, true, false);
   AutocompleteMatch match_prevent(provider_->NavigationToMatch(result));
-  EXPECT_EQ(string16::npos, match_prevent.inline_autocomplete_offset);
+  EXPECT_TRUE(match_prevent.inline_autocompletion.empty());
   EXPECT_EQ(url, match_prevent.fill_into_edit);
   EXPECT_EQ(url, match_prevent.contents);
 }
 
 // Verifies that input "w" marks a more significant domain label than "www.".
 TEST_F(SearchProviderTest, NavigationInlineDomainClassify) {
   QueryForInput(ASCIIToUTF16("w"), false, false);
   AutocompleteMatch match(
       provider_->NavigationToMatch(SearchProvider::NavigationResult(
           *provider_.get(), GURL("http://www.wow.com"), string16(), false, 0,
           false)));
-  EXPECT_EQ(5U, match.inline_autocomplete_offset);
+  EXPECT_EQ(ASCIIToUTF16("ow.com"), match.inline_autocompletion);
   EXPECT_EQ(ASCIIToUTF16("www.wow.com"), match.fill_into_edit);
   EXPECT_EQ(ASCIIToUTF16("www.wow.com"), match.contents);
 
   // Ensure that the match for input "w" is marked on "wow" and not "www".
   ASSERT_EQ(3U, match.contents_class.size());
   EXPECT_EQ(0U, match.contents_class[0].offset);
   EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL,
             match.contents_class[0].style);
   EXPECT_EQ(4U, match.contents_class[1].offset);
   EXPECT_EQ(AutocompleteMatch::ACMatchClassification::URL |
@@ skipping 183 matching lines @@
       } else {
         ASSERT_NE(sug_end, sug_it) << "Failed to find " << suggestion;
         EXPECT_EQ(ASCIIToUTF16(suggestion), sug_it->suggestion());
         ++sug_it;
       }
     }
     EXPECT_EQ(sug_end, sug_it);
     EXPECT_EQ(nav_end, nav_it);
   }
 }