Switch the offset conversion routines from...

chrome/browser/autocomplete/search_provider_unittest.cc

Index: chrome/browser/autocomplete/search_provider_unittest.cc
===================================================================
--- chrome/browser/autocomplete/search_provider_unittest.cc	(revision 221015)
+++ chrome/browser/autocomplete/search_provider_unittest.cc	(working copy)
@@ -1003,6 +1003,11 @@
         "\"google:verbatimrelevance\":0}]",
       { { "a", true }, { "b.com", false }, kEmptyMatch, kEmptyMatch },
       std::string() },
+    { "[\"a\",[\"https://a/\"],[],[],"

[msw, 2013/09/06 00:31:08]

nit: is the trailing '/' needed here and below? It's not obvious that it
exercises the empty inline (and trailing index offset) codepath.

[Peter Kasting, 2013/09/06 19:04:36]

I actually wanted to make sure the trailing slash case still got handled
properly (with the slash stripped off in the output).  The "a.com" case omits
the trailing slash, so we test both.

[msw, 2013/09/09 19:15:52]

Okay, sounds good.

+       "{\"google:suggesttype\":[\"NAVIGATION\"],"
+        "\"google:suggestrelevance\":[9999]}]",
+      { { "https://a", true }, { "a", true }, kEmptyMatch, kEmptyMatch },
+      std::string() },
 
     // Ensure that the top result is ranked as highly as calculated verbatim.
     // Ignore the suggested verbatim relevance if this constraint is violated.
@@ -1661,6 +1666,15 @@
         { "k a",    false, true },
         kEmptyMatch },
       std::string() },
+    { "[\"a\",[\"https://a/\"],[],[],"
+       "{\"google:suggesttype\":[\"NAVIGATION\"],"
+        "\"google:suggestrelevance\":[9999]}]",
+      { { "a",         true, true },
+        { "https://a", false, true },
+        { "k a",       false, true },
+        kEmptyMatch,
+        kEmptyMatch },
+      std::string() },
     // Check when navsuggest scores more than verbatim and there is query
     // suggestion but it scores lower.
     { "[\"a\",[\"http://a1.com\", \"http://a2.com\", \"a3\"],[],[],"
@@ -1949,6 +1963,12 @@
       { { "a.com/a", AutocompleteMatchType::NAVSUGGEST,            true },
         { "a.com",   AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, true },
         kEmptyMatch, kEmptyMatch } },
+    { "a.com", "[\"a.com\",[\"https://a.com\"],[],[],"
+                "{\"google:suggesttype\":[\"NAVIGATION\"],"
+                 "\"google:suggestrelevance\":[9999]}]",
+      { { "https://a.com", AutocompleteMatchType::NAVSUGGEST,            true },
+        { "a.com",         AutocompleteMatchType::SEARCH_WHAT_YOU_TYPED, true },
+        kEmptyMatch, kEmptyMatch } },
 
     // Ensure topmost SUGGEST matches are not allowed for URL input.
     // SearchProvider disregards search and verbatim suggested relevances.
@@ -2124,11 +2144,12 @@
     { "ftp://www.a",          "ftp://a.com",
                               "ftp://a.com",        std::string(), false },
 
-    // Input matching but with nothing to inline will not yield an offset.
+    // Input matching but with nothing to inline will not yield an offset, but
+    // will be allowed to be default.
     { "abc.com",              "http://www.abc.com",
-                                     "www.abc.com", std::string(), false },
+                                     "www.abc.com", std::string(), true },
     { "http://www.abc.com",   "http://www.abc.com",
-                              "http://www.abc.com", std::string(), false },
+                              "http://www.abc.com", std::string(), true },
 
     // Inline matches when the input is a leading substring of the scheme.
     { "h",                    "http://www.abc.com",