Harmony checkbox/radio tweaks

ui/views/controls/button/label_button_unittest.cc

Index: ui/views/controls/button/label_button_unittest.cc
diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc
index 702ed688f2baed7e54ea34a2995dd0b4e60ecd85..5c62da8d425b77a2f1427393297c1b3d02caaf32 100644
--- a/ui/views/controls/button/label_button_unittest.cc
+++ b/ui/views/controls/button/label_button_unittest.cc
@@ -80,12 +80,13 @@ class LabelButtonTest : public test::WidgetTest {
 
     // Establish the expected text colors for testing changes due to state.
     themed_normal_text_color_ = button_->GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_ButtonEnabledColor);
+        ui::NativeTheme::kColorId_LabelEnabledColor);
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
     // The Linux theme provides a non-black highlight text color, but it's not
     // used for styled buttons.
-    styled_highlight_text_color_ = themed_normal_text_color_;
-    styled_normal_text_color_ = themed_normal_text_color_;
+    styled_highlight_text_color_ = styled_normal_text_color_ =
+        button_->GetNativeTheme()->GetSystemColor(
+            ui::NativeTheme::kColorId_ButtonEnabledColor);
 #else
     styled_highlight_text_color_ = button_->GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_ButtonHighlightColor);