Clean up NativeTheme (particularly CommonTheme).

ui/views/controls/button/label_button_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/button/label_button.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ skipping 63 matching lines @@
     // Make a Widget to host the button. This ensures appropriate borders are
     // used (which could be derived from the Widget's NativeTheme).
     test_widget_ = CreateTopLevelPlatformWidget();
 
     button_ = new TestLabelButton;
     test_widget_->GetContentsView()->AddChildView(button_);
 
     // Establish the expected text colors for testing changes due to state.
     themed_normal_text_color_ = button_->GetNativeTheme()->GetSystemColor(
         ui::NativeTheme::kColorId_LabelEnabledColor);
+
+    // For styled buttons only, platforms other than Desktop Linux either ignore
+    // NativeTheme and use a hardcoded black or (on Mac) have a NativeTheme that
+    // reliably returns black.
+    styled_normal_text_color_ = SK_ColorBLACK;
 #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_ = styled_normal_text_color_ =

[tdanderson, 2016/09/30 21:00:56]

Can you break up the multiple assignment into two lines here?

[Evan Stade, 2016/09/30 22:19:00]

is that a style rule? If not it seems like something that should be up to the
author (who was not me).

[tdanderson, 2016/09/30 22:39:37]

I thought it was, but can't find it in the style guide. I generally find that it
detracts from readability, but I suppose that's personal preference.

         button_->GetNativeTheme()->GetSystemColor(
             ui::NativeTheme::kColorId_ButtonEnabledColor);
+#elif defined(OS_MACOSX)
+    styled_highlight_text_color_ = SK_ColorWHITE;
 #else
-    styled_highlight_text_color_ = button_->GetNativeTheme()->GetSystemColor(
-        ui::NativeTheme::kColorId_ButtonHighlightColor);
-
-    // For styled buttons only, platforms other than Desktop Linux either ignore
-    // NativeTheme and use a hardcoded black or (on Mac) have a NativeTheme that
-    // reliably returns black.
-    styled_normal_text_color_ = SK_ColorBLACK;
+    styled_highlight_text_color_ = styled_normal_text_color_;
 #endif
   }
 
   void TearDown() override {
     test_widget_->CloseNow();
     WidgetTest::TearDown();
   }
 
  protected:
   TestLabelButton* button_ = nullptr;
@@ skipping 394 matching lines @@
 
 // Verifies the target event handler View is the |LabelButton| and not any of
 // the child Views.
 TEST_F(InkDropLabelButtonTest, TargetEventHandler) {
   View* target_view = widget_->GetRootView()->GetEventHandlerForPoint(
       button_->bounds().CenterPoint());
   EXPECT_EQ(button_, target_view);
 }
 
 }  // namespace views