Revert of Omnibox: Combine Two Input Type Enums into One

chrome/browser/autocomplete/autocomplete_input_unittest.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 "chrome/browser/autocomplete/autocomplete_input.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_parse.h"
 
 using base::ASCIIToUTF16;
 
 TEST(AutocompleteInputTest, InputType) {
   struct test_data {
     const base::string16 input;
     const AutocompleteInput::Type type;
   } input_cases[] = {
-    { base::string16(), metrics::OmniboxInputType::INVALID },
-    { ASCIIToUTF16("?"), metrics::OmniboxInputType::FORCED_QUERY },
-    { ASCIIToUTF16("?foo"), metrics::OmniboxInputType::FORCED_QUERY },
-    { ASCIIToUTF16("?foo bar"), metrics::OmniboxInputType::FORCED_QUERY },
-    { ASCIIToUTF16("?http://foo.com/bar"), metrics::OmniboxInputType::FORCED_QUERY },
-    { ASCIIToUTF16("foo"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("localhost"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo.c"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("-foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo-.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo_.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("foo.-com"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("foo/"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo/bar"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("foo/bar%00"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("foo/bar/"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo/bar baz\\"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo.com/bar"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo;bar"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("foo/bar baz"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("foo bar.com"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("foo bar"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("foo+bar"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("foo+bar.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("\"foo:bar\""), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("link:foo.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("foo:81"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("localhost:8080"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("www.foo.com:81"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("foo.com:123456"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("foo.com:abc"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("1.2.3.4:abc"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("user@foo.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("user@foo/z"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user@foo/z z"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user@foo.com/z"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user:pass@"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("user:pass@!foo.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("user:pass@foo"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user:pass@foo.c"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user:pass@foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user:pass@foo.com:81"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user:pass@foo:81"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("1.2"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("1.2/45"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("1.2:45"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("user@1.2:45"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user@foo:45"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("user:pass@1.2:45"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("host?query"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("host#ref"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("host/path?query"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("host/path#ref"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("en.wikipedia.org/wiki/Jim Beam"),
-      metrics::OmniboxInputType::URL },
+    { base::string16(), AutocompleteInput::INVALID },
+    { ASCIIToUTF16("?"), AutocompleteInput::FORCED_QUERY },
+    { ASCIIToUTF16("?foo"), AutocompleteInput::FORCED_QUERY },
+    { 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::URL },
+    { ASCIIToUTF16("foo_.com"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("foo.-com"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("foo/"), AutocompleteInput::URL },
+    { ASCIIToUTF16("foo/bar"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("foo/bar%00"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("foo/bar/"), AutocompleteInput::URL },
+    { ASCIIToUTF16("foo/bar baz\\"), AutocompleteInput::URL },
+    { ASCIIToUTF16("foo.com/bar"), AutocompleteInput::URL },
+    { ASCIIToUTF16("foo;bar"), AutocompleteInput::UNKNOWN },
+    { 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::URL },
+    { 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::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::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/Jim Beam"), 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"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("view-source:http://www.foo.com/"),
-      metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("javascript:alert(\"Hi there\");"),
-      metrics::OmniboxInputType::URL },
+    // { ASCIIToUTF16("mailto:abuse@foo.com"), AutocompleteInput::URL },
+    { ASCIIToUTF16("view-source:http://www.foo.com/"), AutocompleteInput::URL },
+    { ASCIIToUTF16("javascript:alert(\"Hi there\");"), AutocompleteInput::URL },
 #if defined(OS_WIN)
-    { ASCIIToUTF16("C:\\Program Files"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("\\\\Server\\Folder\\File"),
-      metrics::OmniboxInputType::URL },
+    { ASCIIToUTF16("C:\\Program Files"), AutocompleteInput::URL },
+    { ASCIIToUTF16("\\\\Server\\Folder\\File"), AutocompleteInput::URL },
 #endif  // defined(OS_WIN)
-    { ASCIIToUTF16("http:foo"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo.c"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo_bar.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo/bar%00"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("http://foo/bar baz"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://-foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo-.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://foo_.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("http://foo.-com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("http://_foo_.com"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("http://foo.com:abc"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("http://foo.com:123456"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("http://1.2.3.4:abc"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("http:user@foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://user@foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http:user:pass@foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://user:pass@foo.com"),
-      metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://1.2"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http://1.2/45"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("http:ps/2 games"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("https://foo.com"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("127.0.0.1"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("127.0.1"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("127.0.1/"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("browser.tabs.closeButtons"),
-      metrics::OmniboxInputType::UNKNOWN },
-    { base::WideToUTF16(L"\u6d4b\u8bd5"), metrics::OmniboxInputType::UNKNOWN },
-    { ASCIIToUTF16("[2001:]"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("[2001:dB8::1]"), metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("192.168.0.256"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("[foo.com]"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("filesystem:http://a.com/t/bar"),
-      metrics::OmniboxInputType::URL },
-    { ASCIIToUTF16("filesystem:http://a.com/"),
-      metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("filesystem:file://"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("filesystem:http"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("filesystem:"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("chrome-search://"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("chrome-devtools:"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("about://f;"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16("://w"), metrics::OmniboxInputType::QUERY },
-    { ASCIIToUTF16(":w"), metrics::OmniboxInputType::QUERY },
+    { ASCIIToUTF16("http:foo"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo.c"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo.com"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo_bar.com"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo/bar%00"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("http://foo/bar baz"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://-foo.com"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo-.com"), AutocompleteInput::URL },
+    { ASCIIToUTF16("http://foo_.com"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("http://foo.-com"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("http://_foo_.com"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("http://foo.com:abc"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("http://foo.com:123456"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("http://1.2.3.4:abc"), AutocompleteInput::QUERY },
+    { 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::URL },
+    { ASCIIToUTF16("browser.tabs.closeButtons"), AutocompleteInput::UNKNOWN },
+    { base::WideToUTF16(L"\u6d4b\u8bd5"), AutocompleteInput::UNKNOWN },
+    { ASCIIToUTF16("[2001:]"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("[2001:dB8::1]"), AutocompleteInput::URL },
+    { ASCIIToUTF16("192.168.0.256"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("[foo.com]"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("filesystem:http://a.com/t/bar"), AutocompleteInput::URL },
+    { ASCIIToUTF16("filesystem:http://a.com/"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("filesystem:file://"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("filesystem:http"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("filesystem:"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("chrome-search://"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("chrome-devtools:"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("about://f;"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16("://w"), AutocompleteInput::QUERY },
+    { ASCIIToUTF16(":w"), AutocompleteInput::QUERY },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
     SCOPED_TRACE(input_cases[i].input);
     AutocompleteInput input(input_cases[i].input, base::string16::npos,
                             base::string16(), GURL(),
                             AutocompleteInput::INVALID_SPEC, true, false, true,
                             true);
     EXPECT_EQ(input_cases[i].type, input.type());
   }
 }
 
 TEST(AutocompleteInputTest, InputTypeWithDesiredTLD) {
   struct test_data {
     const base::string16 input;
     const AutocompleteInput::Type type;
     const std::string spec;  // Unused if not a URL.
   } input_cases[] = {
-    { ASCIIToUTF16("401k"), metrics::OmniboxInputType::URL,
+    { ASCIIToUTF16("401k"), AutocompleteInput::URL,
         std::string("http://www.401k.com/") },
-    { ASCIIToUTF16("999999999999999"), metrics::OmniboxInputType::URL,
+    { ASCIIToUTF16("999999999999999"), AutocompleteInput::URL,
         std::string("http://www.999999999999999.com/") },
-    { ASCIIToUTF16("x@y"), metrics::OmniboxInputType::URL,
+    { ASCIIToUTF16("x@y"), AutocompleteInput::URL,
         std::string("http://x@www.y.com/") },
-    { ASCIIToUTF16("y/z z"), metrics::OmniboxInputType::URL,
+    { ASCIIToUTF16("y/z z"), AutocompleteInput::URL,
         std::string("http://www.y.com/z%20z") },
-    { ASCIIToUTF16("abc.com"), metrics::OmniboxInputType::URL,
+    { ASCIIToUTF16("abc.com"), AutocompleteInput::URL,
         std::string("http://abc.com/") },
-    { ASCIIToUTF16("foo bar"), metrics::OmniboxInputType::QUERY,
-        std::string() },
+    { ASCIIToUTF16("foo bar"), AutocompleteInput::QUERY, std::string() },
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(input_cases); ++i) {
     SCOPED_TRACE(input_cases[i].input);
     AutocompleteInput input(input_cases[i].input, base::string16::npos,
                             ASCIIToUTF16("com"), GURL(),
                             AutocompleteInput::INVALID_SPEC, true, false, true,
                             true);
     EXPECT_EQ(input_cases[i].type, input.type());
-    if (input_cases[i].type == metrics::OmniboxInputType::URL)
+    if (input_cases[i].type == AutocompleteInput::URL)
       EXPECT_EQ(input_cases[i].spec, input.canonicalized_url().spec());
   }
 }
 
 // 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(AutocompleteInputTest, InputCrash) {
   AutocompleteInput input(base::WideToUTF16(L"\uff65@s"), base::string16::npos,
                           base::string16(), GURL(),
                           AutocompleteInput::INVALID_SPEC, true, false,
@@ skipping 79 matching lines @@
     AutocompleteInput input(input_cases[i].input,
                             input_cases[i].cursor_position,
                             base::string16(), GURL(),
                             AutocompleteInput::INVALID_SPEC,
                             true, false, true, true);
     EXPECT_EQ(input_cases[i].normalized_input, input.text());
     EXPECT_EQ(input_cases[i].normalized_cursor_position,
               input.cursor_position());
   }
 }