MacViews: Use bullets for displaying obscured text.

ui/views/controls/label_unittest.cc

 // Copyright (c) 2012 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/views/controls/label.h"
 
 #include <stddef.h>
 
 #include "base/i18n/rtl.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/compositor/canvas_painter.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/border.h"
 #include "ui/views/test/focus_manager_test.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using base::ASCIIToUTF16;
 
 namespace views {
 namespace {
 
 // All text sizing measurements (width and height) should be greater than this.
 const int kMinTextDimension = 4;
 
+#if defined(OS_MACOSX)
+const base::char16 kObscuredCharacter = 0x2022;

[sky, 2016/10/21 15:06:41]

Use the define in rendertext.

[karandeepb, 2016/10/24 12:09:54]

Done.

+#else
+const base::char16 kObscuredCharacter = '*';
+#endif
+
 using LabelTest = ViewsTestBase;
 
 class LabelFocusTest : public FocusManagerTest {
  public:
   LabelFocusTest() {}
   ~LabelFocusTest() override {}
 
  protected:
   Label* label() { return label_; }
 
@@ skipping 150 matching lines @@
   label.SizeToPreferredSize();
 
   // The text should be unobscured by default.
   EXPECT_FALSE(label.obscured());
   EXPECT_EQ(test_text, label.GetDisplayTextForTesting());
   EXPECT_EQ(test_text, label.text());
 
   label.SetObscured(true);
   label.SizeToPreferredSize();
   EXPECT_TRUE(label.obscured());
-  EXPECT_EQ(ASCIIToUTF16("*********"), label.GetDisplayTextForTesting());
+  EXPECT_EQ(base::string16(test_text.size(), kObscuredCharacter),
+            label.GetDisplayTextForTesting());
   EXPECT_EQ(test_text, label.text());
 
   label.SetText(test_text + test_text);
   label.SizeToPreferredSize();
-  EXPECT_EQ(ASCIIToUTF16("******************"),
+  EXPECT_EQ(base::string16(test_text.size() * 2, kObscuredCharacter),
             label.GetDisplayTextForTesting());
   EXPECT_EQ(test_text + test_text, label.text());
 
   label.SetObscured(false);
   label.SizeToPreferredSize();
   EXPECT_FALSE(label.obscured());
   EXPECT_EQ(test_text + test_text, label.GetDisplayTextForTesting());
   EXPECT_EQ(test_text + test_text, label.text());
 }
 
 TEST_F(LabelTest, ObscuredSurrogatePair) {
   // 'MUSICAL SYMBOL G CLEF': represented in UTF-16 as two characters
   // forming the surrogate pair 0x0001D11E.
   Label label;
   base::string16 test_text = base::UTF8ToUTF16("\xF0\x9D\x84\x9E");
   label.SetText(test_text);
   label.SetObscured(true);
   label.SizeToPreferredSize();
-  EXPECT_EQ(ASCIIToUTF16("*"), label.GetDisplayTextForTesting());
+  EXPECT_EQ(base::string16(1, kObscuredCharacter),
+            label.GetDisplayTextForTesting());
   EXPECT_EQ(test_text, label.text());
 }
 
 // This test case verifies the label preferred size will change based on the
 // current layout, which may seem wrong. However many of our code base assumes
 // this behavior, therefore this behavior will have to be kept until the code
 // with this assumption is fixed. See http://crbug.com/468494 and
 // http://crbug.com/467526.
 // TODO(mukai): fix the code assuming this behavior and then fix Label
 // implementation, and remove this test case.
@@ skipping 484 matching lines @@
   label()->SetFocusBehavior(View::FocusBehavior::ALWAYS);
   label()->RequestFocus();
   label()->SizeToPreferredSize();
 
   gfx::Rect focus_bounds = label()->GetFocusBounds();
   EXPECT_FALSE(focus_bounds.IsEmpty());
   EXPECT_LT(label()->font_list().GetHeight(), focus_bounds.height());
 }
 
 }  // namespace views