Reintroduce password support to NativeTextfieldViews

ui/gfx/render_text_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/render_text.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 11 matching lines @@
   // Test that the built-in default style is applied for new text.
   render_text->SetText(ASCIIToUTF16("abc"));
   EXPECT_EQ(1U, render_text->style_ranges().size());
   StyleRange style;
   EXPECT_EQ(style.font.GetFontName(),
             render_text->style_ranges()[0].font.GetFontName());
   EXPECT_EQ(style.foreground, render_text->style_ranges()[0].foreground);
   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());
   EXPECT_TRUE(render_text->text().empty());
   EXPECT_TRUE(render_text->style_ranges().empty());
 }
 
 TEST_F(RenderTextTest, CustomDefaultStyle) {
   // Test a custom default style.
   scoped_ptr<RenderText> render_text(RenderText::CreateRenderText());
@@ skipping 91 matching lines @@
   EXPECT_EQ(ui::Range(0, 5), render_text->style_ranges()[0].range);
   EXPECT_TRUE(render_text->style_ranges()[0].underline);
   EXPECT_TRUE(render_text->style_ranges()[0].strike);
 
   // Apply the default style.
   render_text->ApplyDefaultStyle();
   EXPECT_EQ(1U, render_text->style_ranges().size());
   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"));
   underline.range = ui::Range(0, 3);
   render_text->ApplyStyleRange(underline);
   color.range = ui::Range(3, 6);
   render_text->ApplyStyleRange(color);
   strike.range = ui::Range(6, 9);
   render_text->ApplyStyleRange(strike);
   EXPECT_EQ(3U, render_text->style_ranges().size());
@@ skipping 118 matching lines @@
   EXPECT_EQ(ui::Range(0, 3), render_text->style_ranges()[0].range);
 
   SetTextWith2ExtraStyles(render_text.get());
   EXPECT_EQ(3U, render_text->style_ranges().size());
 
   render_text->SetText(ASCIIToUTF16("a"));
   EXPECT_EQ(1U, render_text->style_ranges().size());
   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) {
   for (int i = 0; i < static_cast<int>(expected.size()); ++i) {
     SelectionModel sel = expected[i];
     EXPECT_TRUE(render_text->selection_model().Equals(sel));
     if (move_right)
       render_text->MoveCursorRight(CHARACTER_BREAK, false);
     else
       render_text->MoveCursorLeft(CHARACTER_BREAK, false);
@@ skipping 455 matching lines @@
   EXPECT_EQ(5U, render_text->GetCursorPosition());
   render_text->MoveCursorRight(WORD_BREAK, false);
   EXPECT_EQ(6U, render_text->GetCursorPosition());
   render_text->MoveCursorRight(WORD_BREAK, false);
   EXPECT_EQ(6U, render_text->GetCursorPosition());
 }
 
 #endif
 
 }  // namespace gfx