diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 20:27:04 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 20:27:04 +0000 |
| commit | 5f0cebb46d66ef0a1996594d0846c0067a8cf475 (patch) | |
| tree | 5b3204961a403e7396fe48b45930b5b6528839f0 /chrome/browser/autocomplete/autocomplete_input_unittest.cc | |
| parent | 20023a76c3ffa049c35f86263fbf6ee4bbf00ade (diff) | |
| download | chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.zip chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.gz chromium_src-5f0cebb46d66ef0a1996594d0846c0067a8cf475.tar.bz2 | |
Add utf_string_conversions to base namespace.
This adds "using"s for all functions so those can be fixed in a separate pass.
This converts the "Wide" versions of the functions in the Chrome directory as a first pass on the changeover.
BUG=
Review URL: https://codereview.chromium.org/12314090
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184352 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete/autocomplete_input_unittest.cc')
| -rw-r--r-- | chrome/browser/autocomplete/autocomplete_input_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_input_unittest.cc b/chrome/browser/autocomplete/autocomplete_input_unittest.cc index e7f9291..73cbbf3 100644 --- a/chrome/browser/autocomplete/autocomplete_input_unittest.cc +++ b/chrome/browser/autocomplete/autocomplete_input_unittest.cc @@ -106,7 +106,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 }, @@ -150,8 +150,9 @@ 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"), string16::npos, string16(), - true, false, true, AutocompleteInput::ALL_MATCHES); + AutocompleteInput input(base::WideToUTF16(L"\uff65@s"), string16::npos, + string16(), true, false, true, + AutocompleteInput::ALL_MATCHES); } TEST(AutocompleteInputTest, ParseForEmphasizeComponent) { @@ -170,7 +171,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/"), |