diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:14:53 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-24 21:14:53 +0000 |
| commit | 47e870bf26f0c01dafe611ec03c0139c735063df (patch) | |
| tree | 43b29b36654d896cf3fd1bd3cc27b830c63522b0 /chrome/browser/autocomplete/autocomplete_input_unittest.cc | |
| parent | 883844f40f19b80880e0730a8e2836e6383d1400 (diff) | |
| download | chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.zip chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.gz chromium_src-47e870bf26f0c01dafe611ec03c0139c735063df.tar.bz2 | |
Revert 184352
> 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
TBR=brettw@chromium.org
Review URL: https://codereview.chromium.org/12315071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184355 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, 4 insertions, 5 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_input_unittest.cc b/chrome/browser/autocomplete/autocomplete_input_unittest.cc index 73cbbf3..e7f9291 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 }, - { 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 }, @@ -150,9 +150,8 @@ 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(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) { @@ -171,7 +170,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) }, - { 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/"), |