Reintroduce password support to NativeTextfieldViews

ui/gfx/render_text_unittest.cc

Index: ui/gfx/render_text_unittest.cc
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index c564c60f3a67c909c65e347752778d9334a46499..9005580346b740d5d34064a685c9402e47b0d71e 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -29,6 +29,7 @@ TEST_F(RenderTextTest, DefaultStyle) {
   EXPECT_EQ(ui::Range(0, 3), render_text->style_ranges()[0].range);
   EXPECT_EQ(style.strike, render_text->style_ranges()[0].strike);
   EXPECT_EQ(style.underline, render_text->style_ranges()[0].underline);
+  EXPECT_EQ(style.password, render_text->style_ranges()[0].password);
 
   // Test that clearing the text also clears the styles.
   render_text->SetText(string16());
@@ -140,6 +141,7 @@ TEST_F(RenderTextTest, ApplyStyleRange) {
   EXPECT_EQ(ui::Range(0, 5), render_text->style_ranges()[0].range);
   EXPECT_FALSE(render_text->style_ranges()[0].underline);
   EXPECT_FALSE(render_text->style_ranges()[0].strike);
+  EXPECT_FALSE(render_text->style_ranges()[0].password);
 
   // Apply new style range that contains the 2nd last old style range.
   render_text->SetText(ASCIIToUTF16("abcdefghi"));
@@ -278,6 +280,31 @@ TEST_F(RenderTextTest, StyleRangesAdjust) {
   EXPECT_EQ(ui::Range(0, 1), render_text->style_ranges()[0].range);
 }
 
+TEST_F(RenderTextTest, PasswordCensorship) {
+  // Obscured text from GetCensoredText() should match the style range.
+  const string16 seuss = ASCIIToUTF16("hop on pop");
+  scoped_ptr<RenderText> render_text(RenderText::CreateRenderText());
+
+  StyleRange pw;
+  pw.password = true;
+  pw.range = ui::Range(2, 8);
+
+  render_text->SetText(seuss);
+  render_text->ApplyStyleRange(pw);
+  EXPECT_EQ(render_text->text(), seuss);
+  EXPECT_EQ(render_text->GetCensoredText(), ASCIIToUTF16("ho******op"));

[oshima, 2011/12/01 21:36:47]

EXPECT_EQ(<expected>, <actual>)

[benrg, 2011/12/01 22:36:15]

Done.

+
+  render_text->SetText(seuss);
+  EXPECT_EQ(render_text->text(), seuss);
+  EXPECT_EQ(render_text->GetCensoredText(), ASCIIToUTF16("ho******op"));
+
+  StyleRange nopw;
+  nopw.range = ui::Range(1, 7);
+
+  render_text->ApplyStyleRange(nopw);
+  EXPECT_EQ(render_text->GetCensoredText(), ASCIIToUTF16("hop on *op"));
+}
+
 void RunMoveCursorLeftRightTest(RenderText* render_text,
     const std::vector<SelectionModel>& expected,
     bool move_right) {