Make text input type and password visibility bit independent in Textfield

ui/views/view_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 <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 935 matching lines @@
   result.clear();
   clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   EXPECT_EQ(kReadOnlyText, result);
 
   normal->SelectAll();
   ::SendMessage(normal->GetTestingHandle(), WM_COPY, 0, 0);
   result.clear();
   clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
   EXPECT_EQ(kNormalText, result);
 
+  // We don't let you copy from an obscured field, clipboard should not change.
   password->SelectAll();
   ::SendMessage(password->GetTestingHandle(), WM_COPY, 0, 0);
   result.clear();
   clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
-  // We don't let you copy from an obscured field, clipboard should not have
-  // changed.
   EXPECT_EQ(kNormalText, result);
+  // But copying is allowed when STYLE_OBSCURED is clear, even if the text input
+  // type is still PASSWORD.
+  password->SetObscured(false);
+  ::SendMessage(password->GetTestingHandle(), WM_COPY, 0, 0);
+  result.clear();
+  clipboard.ReadText(ui::Clipboard::BUFFER_STANDARD, &result);
+  EXPECT_EQ(kPasswordText, result);
+  password->SetObscured(true);

[oshima, 2012/01/30 23:56:24]

can you add tests in native_textfied_views as well? This is win only and doesn't
run on chromeos aura

 
   //
   // Test Paste.
   //
   // Note that we use GetWindowText instead of Textfield::GetText below as the
   // text in the Textfield class is synced to the text of the HWND on
   // WM_KEYDOWN messages that we are not simulating here.
 
-  // Attempting to copy kNormalText in a read-only text-field should fail.
+  // Attempting to replace the text in a read-only text-field should fail.
   read_only->SelectAll();
   ::SendMessage(read_only->GetTestingHandle(), WM_KEYDOWN, 0, 0);
   wchar_t buffer[1024] = { 0 };
   ::GetWindowText(read_only->GetTestingHandle(), buffer, 1024);
   EXPECT_EQ(kReadOnlyText, string16(buffer));
 
+  // Pasting into a password field should work.
+  normal->SelectAll();
+  ::SendMessage(normal->GetTestingHandle(), WM_COPY, 0, 0);
   password->SelectAll();
   ::SendMessage(password->GetTestingHandle(), WM_PASTE, 0, 0);
   ::GetWindowText(password->GetTestingHandle(), buffer, 1024);
   EXPECT_EQ(kNormalText, string16(buffer));
 
   // Copy from read_only so the string we are pasting is not the same as the
   // current one.
   read_only->SelectAll();
   ::SendMessage(read_only->GetTestingHandle(), WM_COPY, 0, 0);
   normal->SelectAll();
@@ skipping 2139 matching lines @@
   // Move c1 to the front. The layers should have moved too.
   content->ReorderChildView(c1, -1);
   EXPECT_EQ(c1->layer(), parent_layer->children()[1]);
   EXPECT_EQ(c2->layer(), parent_layer->children()[0]);
 }
 #endif
 
 #endif  // VIEWS_COMPOSITOR
 
 }  // namespace views