Views:: Use TestClipboard in ScopedViewsTestHelper.

ui/views/controls/textfield/textfield_unittest.cc

Index: ui/views/controls/textfield/textfield_unittest.cc
diff --git a/ui/views/controls/textfield/textfield_unittest.cc b/ui/views/controls/textfield/textfield_unittest.cc
index 55631ce38cb7aacbeb4908ea8b69f88166929adc..13e2b3da54dfca41c97d94a5298f8379ffd172ca 100644
--- a/ui/views/controls/textfield/textfield_unittest.cc
+++ b/ui/views/controls/textfield/textfield_unittest.cc
@@ -2605,8 +2605,7 @@ TEST_F(TextfieldTest, KeepInitiallySelectedWord) {
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// flaky: http://crbug.com/396477
-TEST_F(TextfieldTest, DISABLED_SelectionClipboard) {
+TEST_F(TextfieldTest, SelectionClipboard) {
   InitTextfield();
   textfield_->SetText(ASCIIToUTF16("0123"));
   gfx::Point point_1(GetCursorPositionX(1), 0);
@@ -2691,7 +2690,7 @@ TEST_F(TextfieldTest, DISABLED_SelectionClipboard) {
   EXPECT_STR_EQ("0123", GetClipboardText(ui::CLIPBOARD_TYPE_SELECTION));
 
   // Middle clicking with an empty selection clipboard should still focus.
-  SetClipboardText(ui::CLIPBOARD_TYPE_COPY_PASTE, std::string());

[karandeepb, 2016/11/16 04:16:15]

I think this was a mistake/typo.

+  SetClipboardText(ui::CLIPBOARD_TYPE_SELECTION, std::string());
   textfield_->GetFocusManager()->ClearFocus();
   EXPECT_FALSE(textfield_->HasFocus());
   textfield_->OnMousePressed(middle);
@@ -2748,8 +2747,8 @@ TEST_F(TextfieldTest, DISABLED_SelectionClipboard) {
 }
 
 // Verify that the selection clipboard is not updated for selections on a
-// password textfield. Disabled due to http://crbug.com/396477.
-TEST_F(TextfieldTest, DISABLED_SelectionClipboard_Password) {
+// password textfield.
+TEST_F(TextfieldTest, SelectionClipboard_Password) {
   InitTextfields(2);
   textfield_->SetText(ASCIIToUTF16("abcd"));