| Index: chrome/browser/autocomplete/autocomplete_input_unittest.cc
|
| diff --git a/chrome/browser/autocomplete/autocomplete_input_unittest.cc b/chrome/browser/autocomplete/autocomplete_input_unittest.cc
|
| index f3110a9116442beb9983ed791bd0658109a109b6..2720f30777f29b534b9ecdeb5090608b143152e5 100644
|
| --- a/chrome/browser/autocomplete/autocomplete_input_unittest.cc
|
| +++ b/chrome/browser/autocomplete/autocomplete_input_unittest.cc
|
| @@ -11,6 +11,8 @@
|
| #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;
|
| @@ -106,7 +108,7 @@ TEST(AutocompleteInputTest, InputType) {
|
| { ASCIIToUTF16("127.0.1"), AutocompleteInput::UNKNOWN },
|
| { ASCIIToUTF16("127.0.1/"), AutocompleteInput::URL },
|
| { ASCIIToUTF16("browser.tabs.closeButtons"), AutocompleteInput::UNKNOWN },
|
| - { WideToUTF16(L"\u6d4b\u8bd5"), 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 },
|
| @@ -163,7 +165,7 @@ TEST(AutocompleteInputTest, InputTypeWithDesiredTLD) {
|
| // 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(WideToUTF16(L"\uff65@s"), base::string16::npos,
|
| + AutocompleteInput input(base::WideToUTF16(L"\uff65@s"), base::string16::npos,
|
| base::string16(), GURL(),
|
| AutocompleteInput::INVALID_SPEC, true, false,
|
| true, AutocompleteInput::ALL_MATCHES);
|
| @@ -185,7 +187,7 @@ TEST(AutocompleteInputTest, ParseForEmphasizeComponent) {
|
| { 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) },
|
| - { WideToUTF16(L"\u6d4b\u8bd5"), kInvalidComponent, Component(0, 2) },
|
| + { base::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/"),
|
|
|