Tweak omnibox parsing heuristics more:

chrome/browser/autocomplete/autocomplete_unittest.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 273 matching lines @@
     { ASCIIToUTF16("?foo bar"), AutocompleteInput::FORCED_QUERY },
     { ASCIIToUTF16("?http://foo.com/bar"), AutocompleteInput::FORCED_QUERY },
     { ASCIIToUTF16("foo"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("localhost"), AutocompleteInput::URL },
     { ASCIIToUTF16("foo.c"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("-foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("foo-.com"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("foo.-com"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("foo/bar"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("foo.com/bar"), AutocompleteInput::URL },
     { ASCIIToUTF16("foo;bar"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("foo/bar baz"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("foo bar.com"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("foo bar"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("foo+bar"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("foo+bar.com"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("\"foo:bar\""), AutocompleteInput::QUERY },
     { ASCIIToUTF16("link:foo.com"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("foo:81"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("localhost:8080"), AutocompleteInput::URL },
     { ASCIIToUTF16("www.foo.com:81"), AutocompleteInput::URL },
     { ASCIIToUTF16("foo.com:123456"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("foo.com:abc"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("1.2.3.4:abc"), AutocompleteInput::QUERY },
     { ASCIIToUTF16("user@foo.com"), AutocompleteInput::UNKNOWN },
-    { ASCIIToUTF16("user@foo/z"), AutocompleteInput::UNKNOWN },
-    { ASCIIToUTF16("user@foo/z z"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("user@foo/z"), AutocompleteInput::URL },
+    { ASCIIToUTF16("user@foo/z z"), AutocompleteInput::URL },
     { ASCIIToUTF16("user@foo.com/z"), AutocompleteInput::URL },
     { ASCIIToUTF16("user:pass@"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("user:pass@!foo.com"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("user:pass@foo"), AutocompleteInput::URL },
     { ASCIIToUTF16("user:pass@foo.c"), AutocompleteInput::URL },
     { ASCIIToUTF16("user:pass@foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("user:pass@foo.com:81"), AutocompleteInput::URL },
     { ASCIIToUTF16("user:pass@foo:81"), AutocompleteInput::URL },
     { ASCIIToUTF16("1.2"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("1.2/45"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("1.2:45"), AutocompleteInput::UNKNOWN },
-    { ASCIIToUTF16("user@1.2:45"), AutocompleteInput::UNKNOWN },
-    { ASCIIToUTF16("user@foo:45"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("user@1.2:45"), AutocompleteInput::URL },
+    { ASCIIToUTF16("user@foo:45"), AutocompleteInput::URL },
     { ASCIIToUTF16("user:pass@1.2:45"), AutocompleteInput::URL },
+    { ASCIIToUTF16("host?query"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("host#ref"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("host/path?query"), AutocompleteInput::URL },
+    { ASCIIToUTF16("host/path#ref"), AutocompleteInput::URL },
     { ASCIIToUTF16("en.wikipedia.org/wiki/James Bond"),
         AutocompleteInput::URL },
     // In Chrome itself, mailto: will get handled by ShellExecute, but in
     // unittest mode, we don't have the data loaded in the external protocol
     // handler to know this.
     // { ASCIIToUTF16("mailto:abuse@foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("view-source:http://www.foo.com/"), AutocompleteInput::URL },
     { ASCIIToUTF16("javascript:alert(\"Hey there!\");"),
         AutocompleteInput::URL },
 #if defined(OS_WIN)
@@ skipping 16 matching lines @@
     { ASCIIToUTF16("http:user@foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("http://user@foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("http:user:pass@foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("http://user:pass@foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("http://1.2"), AutocompleteInput::URL },
     { ASCIIToUTF16("http://1.2/45"), AutocompleteInput::URL },
     { ASCIIToUTF16("http:ps/2 games"), AutocompleteInput::URL },
     { ASCIIToUTF16("https://foo.com"), AutocompleteInput::URL },
     { ASCIIToUTF16("127.0.0.1"), AutocompleteInput::URL },
     { ASCIIToUTF16("127.0.1"), AutocompleteInput::UNKNOWN },
-    { ASCIIToUTF16("127.0.1/"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("127.0.1/"), AutocompleteInput::URL },
     { ASCIIToUTF16("browser.tabs.closeButtons"), AutocompleteInput::UNKNOWN },
     { WideToUTF16(L"\u6d4b\u8bd5"), AutocompleteInput::UNKNOWN },
     { ASCIIToUTF16("[2001:]"), AutocompleteInput::QUERY },  // Not a valid IP
     { ASCIIToUTF16("[2001:dB8::1]"), AutocompleteInput::URL },
     { ASCIIToUTF16("192.168.0.256"),
         AutocompleteInput::QUERY },  // Invalid IPv4 literal.
     { ASCIIToUTF16("[foo.com]"),
         AutocompleteInput::QUERY },  // Invalid IPv6 literal.
   };
 
   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);
     EXPECT_EQ(input_cases[i].type, input.type());
   }
 }
 
 TEST_F(AutocompleteTest, 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/z z"), 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);
-    EXPECT_EQ(input_cases[i].type, input.type()) << "Input: " <<
-        input_cases[i].input;
+    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_F(AutocompleteTest, InputCrash) {
   AutocompleteInput input(WideToUTF16(L"\uff65@s"), string16(), true, false,
                           true, AutocompleteInput::ALL_MATCHES);
 }
 
@@ skipping 51 matching lines @@
     { ASCIIToUTF16("view-source:"), Component(0, 11), kInvalidComponent },
     { ASCIIToUTF16("view-source:garbage"), kInvalidComponent,
         Component(12, 7) },
     { ASCIIToUTF16("view-source:http://http://foo"), Component(12, 4),
         Component(19, 4) },
     { ASCIIToUTF16("view-source:view-source:http://example.com/"),
         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);
-    EXPECT_EQ(input_cases[i].scheme.begin, scheme.begin) << "Input: " <<
-        input_cases[i].input;
-    EXPECT_EQ(input_cases[i].scheme.len, scheme.len) << "Input: " <<
-        input_cases[i].input;
-    EXPECT_EQ(input_cases[i].host.begin, host.begin) << "Input: " <<
-        input_cases[i].input;
-    EXPECT_EQ(input_cases[i].host.len, host.len) << "Input: " <<
-        input_cases[i].input;
+    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);
   }
 }
 
 }  // namespace