Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(182)

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

Issue 2164483006: [MacViews] Implemented text context menu (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
index 8761ed4da7d4442d31fb83d70d07ac1a350167cb..6f9a643f78344d2eb66d6294d1f3bbdbdeb5912e 100644
--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm
@@ -308,7 +308,7 @@ class RenderWidgetHostViewMacTest : public RenderViewHostImplTestHarness {
}
protected:
- std::string selected_text() const { return rwhv_mac_->selected_text_; }
+ base::string16 selected_text() const { return rwhv_mac_->selected_text_; }
RenderWidgetHostViewMac* rwhv_mac_;
base::scoped_nsobject<RenderWidgetHostViewCocoa> rwhv_cocoa_;
@@ -1340,23 +1340,22 @@ TEST_F(RenderWidgetHostViewMacTest, EventLatencyOSMouseWheelHistogram) {
// This test verifies that |selected_text_| is updated accordingly with
// different variations of RWHVMac::SelectChanged updates.
TEST_F(RenderWidgetHostViewMacTest, SelectedText) {
- base::string16 sample_text;
- base::UTF8ToUTF16("hello world!", 12, &sample_text);
+ base::string16 sample_text = base::ASCIIToUTF16("hello world!");
gfx::Range range(6, 11);
// Send a valid selection for the word 'World'.
rwhv_mac_->SelectionChanged(sample_text, 0U, range);
- EXPECT_EQ("world", selected_text());
+ EXPECT_EQ(base::ASCIIToUTF16("world"), selected_text());
// Make the range cover some of the text and extend more.
range.set_end(100);
rwhv_mac_->SelectionChanged(sample_text, 0U, range);
- EXPECT_EQ("world!", selected_text());
+ EXPECT_EQ(base::ASCIIToUTF16("world!"), selected_text());
// Finally, send an empty range. This should clear the selected text.
range.set_start(100);
rwhv_mac_->SelectionChanged(sample_text, 0U, range);
- EXPECT_EQ("", selected_text());
+ EXPECT_EQ(base::string16(), selected_text());
}
// This class is used for IME-related unit tests which verify correctness of IME
« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_mac.mm ('k') | content/public/browser/render_widget_host_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698