Revert 184352

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/string16.h"
 #include "base/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 88 matching lines @@
     { 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 },
+    { 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:foo"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:file://"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:http"), AutocompleteInput::URL },
     { ASCIIToUTF16("filesystem:"), AutocompleteInput::URL },
     { ASCIIToUTF16("ftp:"), AutocompleteInput::URL },
@@ skipping 23 matching lines @@
     AutocompleteInput input(input_cases[i].input, string16::npos,
                             ASCIIToUTF16("com"), true, false, true,
                             AutocompleteInput::ALL_MATCHES);
     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(AutocompleteInputTest, InputCrash) {
-  AutocompleteInput input(base::WideToUTF16(L"\uff65@s"), string16::npos,
-                          string16(), true, false, true,
-                          AutocompleteInput::ALL_MATCHES);
+  AutocompleteInput input(WideToUTF16(L"\uff65@s"), string16::npos, string16(),
+                          true, false, true, AutocompleteInput::ALL_MATCHES);
 }
 
 TEST(AutocompleteInputTest, ParseForEmphasizeComponent) {
   using url_parse::Component;
   Component kInvalidComponent(0, -1);
   struct test_data {
     const string16 input;
     const Component scheme;
     const Component host;
   } input_cases[] = {
     { string16(), kInvalidComponent, kInvalidComponent },
     { ASCIIToUTF16("?"), kInvalidComponent, kInvalidComponent },
     { ASCIIToUTF16("?http://foo.com/bar"), kInvalidComponent,
         kInvalidComponent },
     { ASCIIToUTF16("foo/bar baz"), kInvalidComponent, Component(0, 3) },
     { ASCIIToUTF16("http://foo/bar baz"), Component(0, 4), Component(7, 3) },
     { ASCIIToUTF16("link:foo.com"), Component(0, 4), kInvalidComponent },
     { ASCIIToUTF16("www.foo.com:81"), kInvalidComponent, Component(0, 11) },
-    { base::WideToUTF16(L"\u6d4b\u8bd5"), kInvalidComponent, Component(0, 2) },
+    { WideToUTF16(L"\u6d4b\u8bd5"), kInvalidComponent, Component(0, 2) },
     { ASCIIToUTF16("view-source:http://www.foo.com/"), Component(12, 4),
         Component(19, 11) },
     { ASCIIToUTF16("view-source:https://example.com/"),
       Component(12, 5), Component(20, 11) },
     { ASCIIToUTF16("view-source:www.foo.com"), kInvalidComponent,
         Component(12, 11) },
     { ASCIIToUTF16("view-source:"), Component(0, 11), kInvalidComponent },
     { ASCIIToUTF16("view-source:garbage"), kInvalidComponent,
         Component(12, 7) },
     { ASCIIToUTF16("view-source:http://http://foo"), Component(12, 4),
@@ skipping 47 matching lines @@
     SCOPED_TRACE(input_cases[i].input);
     AutocompleteInput input(input_cases[i].input,
                             input_cases[i].cursor_position,
                             string16(), true, false, true,
                             AutocompleteInput::ALL_MATCHES);
     EXPECT_EQ(input_cases[i].normalized_input, input.text());
     EXPECT_EQ(input_cases[i].normalized_cursor_position,
               input.cursor_position());
   }
 }