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..ed1dcf53ab0b0bc940c678d6d5e797146139f270 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_; |
@@ -1346,17 +1346,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 |