diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:11:46 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:11:46 +0000 |
| commit | 74f778ee567a5e18ae6766416711b92fc6e7f39a (patch) | |
| tree | c2da3cc66ebb5285d8ff3f210ebdb446eb61837f /content/renderer/render_view_browsertest_mac.mm | |
| parent | a80aea7ebc002065d8f24c54673c72cb61d47b07 (diff) | |
| download | chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.zip chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.tar.gz chromium_src-74f778ee567a5e18ae6766416711b92fc6e7f39a.tar.bz2 | |
Move UTF16ToASCII, remove WideToASCII.
This removes WideToASCII and changes all callers to use UTF16ToASCII instead.
Moves UTF16ToASCII from base/strings/string_util.h to base/strings/utf_string_conversions.h and into the base namespace.
Convert a few related string_util functions to take a StringPiece16 instead of a string16. Remove IsStringASCII(std::wstring) which was unused.
Updates callers' includes and namespace usage accordingly.
TBR=sky
Review URL: https://codereview.chromium.org/176843022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_browsertest_mac.mm')
| -rw-r--r-- | content/renderer/render_view_browsertest_mac.mm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm index f0959e0..93174c8 100644 --- a/content/renderer/render_view_browsertest_mac.mm +++ b/content/renderer/render_view_browsertest_mac.mm @@ -4,6 +4,7 @@ #include "base/strings/string16.h" #include "base/strings/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "content/public/browser/native_web_keyboard_event.h" #include "content/public/test/render_view_test.h" #include "content/renderer/render_view_impl.h" @@ -103,7 +104,7 @@ TEST_F(RenderViewTest, MacTestCmdUp) { ProcessPendingMessages(); ExecuteJavaScript("scroll.textContent = window.pageYOffset"); output = GetMainFrame()->contentAsText(kMaxOutputCharacters); - EXPECT_EQ(kArrowDownScrollDown, UTF16ToASCII(output)); + EXPECT_EQ(kArrowDownScrollDown, base::UTF16ToASCII(output)); const char* kArrowUpScrollUp = "38,false,false,true,false\n0\np1"; view->OnSetEditCommandsForNextKeyEvent( @@ -112,7 +113,7 @@ TEST_F(RenderViewTest, MacTestCmdUp) { ProcessPendingMessages(); ExecuteJavaScript("scroll.textContent = window.pageYOffset"); output = GetMainFrame()->contentAsText(kMaxOutputCharacters); - EXPECT_EQ(kArrowUpScrollUp, UTF16ToASCII(output)); + EXPECT_EQ(kArrowUpScrollUp, base::UTF16ToASCII(output)); // Now let javascript eat the key events -- no scrolling should happen. // Set a scroll position slightly down the page to ensure that it does not @@ -126,7 +127,7 @@ TEST_F(RenderViewTest, MacTestCmdUp) { ProcessPendingMessages(); ExecuteJavaScript("scroll.textContent = window.pageYOffset"); output = GetMainFrame()->contentAsText(kMaxOutputCharacters); - EXPECT_EQ(kArrowDownNoScroll, UTF16ToASCII(output)); + EXPECT_EQ(kArrowDownNoScroll, base::UTF16ToASCII(output)); const char* kArrowUpNoScroll = "38,false,false,true,false\n100\np1"; view->OnSetEditCommandsForNextKeyEvent( @@ -135,7 +136,7 @@ TEST_F(RenderViewTest, MacTestCmdUp) { ProcessPendingMessages(); ExecuteJavaScript("scroll.textContent = window.pageYOffset"); output = GetMainFrame()->contentAsText(kMaxOutputCharacters); - EXPECT_EQ(kArrowUpNoScroll, UTF16ToASCII(output)); + EXPECT_EQ(kArrowUpNoScroll, base::UTF16ToASCII(output)); } } // namespace content |