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

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: Addressed tapted's comments and fixed tests Created 3 years, 11 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 a9361d3dccf273a2a7cf3dc38dede52a14500b83..2b7e73440a8703333862af4c21fa0adf4115faea 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_;
@@ -1345,17 +1345,17 @@ TEST_F(RenderWidgetHostViewMacTest, SelectedText) {
// Send a valid selection for the word 'World'.
rwhv_mac_->SelectionChanged(sample_text, 0U, range);
- EXPECT_EQ("world", selected_text());
+ EXPECT_EQ(base::UTF8ToUTF16("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::UTF8ToUTF16("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

Powered by Google App Engine
This is Rietveld 408576698