Revert of retry r266042:

ui/views/controls/label.cc

Index: ui/views/controls/label.cc
diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc
index 35c9aa0a8f639d753581d7c057e320594a071639..717d2e08a445b2af147a964653f10b86a80f5c81 100644
--- a/ui/views/controls/label.cc
+++ b/ui/views/controls/label.cc
@@ -378,25 +378,14 @@
 }
 
 void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) {
-  if (!enabled_color_set_) {
-    requested_enabled_color_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelEnabledColor);
-  }
-  if (!disabled_color_set_) {
-    requested_disabled_color_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelDisabledColor);
-  }
-  if (!background_color_set_) {
-    background_color_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_LabelBackgroundColor);
-  }
-  RecalculateColors();
+  UpdateColorsFromTheme(theme);
 }
 
 void Label::Init(const base::string16& text, const gfx::FontList& font_list) {
   font_list_ = font_list;
   enabled_color_set_ = disabled_color_set_ = background_color_set_ = false;
   auto_color_readability_ = true;
+  UpdateColorsFromTheme(ui::NativeTheme::instance());
   horizontal_alignment_ = gfx::ALIGN_CENTER;
   line_height_ = 0;
   is_multi_line_ = false;
@@ -490,12 +479,12 @@
 
   flags |= gfx::Canvas::MULTI_LINE;
 #if !defined(OS_WIN)
-  // Don't elide multiline labels on Linux.
-  // Todo(davemoore): Do we depend on eliding multiline text?
-  // Pango insists on limiting the number of lines to one if text is
-  // elided. You can get around this if you can pass a maximum height
-  // but we don't currently have that data when we call the pango code.
-  flags |= gfx::Canvas::NO_ELLIPSIS;
+    // Don't elide multiline labels on Linux.
+    // Todo(davemoore): Do we depend on eliding multiline text?
+    // Pango insists on limiting the number of lines to one if text is
+    // elided. You can get around this if you can pass a maximum height
+    // but we don't currently have that data when we call the pango code.
+    flags |= gfx::Canvas::NO_ELLIPSIS;
 #endif
   if (allow_character_break_)
     flags |= gfx::Canvas::CHARACTER_BREAK;
@@ -545,6 +534,22 @@
      *flags |= gfx::Canvas::NO_ELLIPSIS;
 }
 
+void Label::UpdateColorsFromTheme(const ui::NativeTheme* theme) {
+  if (!enabled_color_set_) {
+    requested_enabled_color_ = theme->GetSystemColor(
+        ui::NativeTheme::kColorId_LabelEnabledColor);
+  }
+  if (!disabled_color_set_) {
+    requested_disabled_color_ = theme->GetSystemColor(
+        ui::NativeTheme::kColorId_LabelDisabledColor);
+  }
+  if (!background_color_set_) {
+    background_color_ = theme->GetSystemColor(
+        ui::NativeTheme::kColorId_LabelBackgroundColor);
+  }
+  RecalculateColors();
+}
+
 void Label::ResetCachedSize() {
   text_size_valid_ = false;
   cached_heights_cursor_ = 0;