Views:: Use TestClipboard in ScopedViewsTestHelper.

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/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 904 matching lines @@
 
   PerformMouseDragTo(gfx::Point());
   EXPECT_STR_EQ("Label drag", GetSelectedText());
 
   PerformMouseDragTo(gfx::Point(200, 0));
   PerformMouseRelease(gfx::Point(200, 0));
   EXPECT_STR_EQ("drag word", GetSelectedText());
 }
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-// Verify selection clipboard behavior on text selection. Disabled due to
-// http://crbug.com/396477.
-TEST_F(LabelSelectionTest, DISABLED_SelectionClipboard) {
+// Verify selection clipboard behavior on text selection.
+TEST_F(LabelSelectionTest, SelectionClipboard) {
   label()->SetText(ASCIIToUTF16("Label selection clipboard"));
   label()->SizeToPreferredSize();
   ASSERT_TRUE(label()->SetSelectable(true));
 
   // Verify programmatic modification of selection, does not modify the
   // selection clipboard.
   label()->SelectRange(gfx::Range(2, 5));
   EXPECT_STR_EQ("bel", GetSelectedText());
   EXPECT_TRUE(GetSelectionClipboardText().empty());
 
   // Verify text selection using the mouse updates the selection clipboard.
   PerformMousePress(GetCursorPoint(5));
   PerformMouseDragTo(gfx::Point());
   PerformMouseRelease(gfx::Point());
   EXPECT_STR_EQ("Label", GetSelectedText());
   EXPECT_STR_EQ("Label", GetSelectionClipboardText());
 }
 #endif
 
 }  // namespace views