Only use GetCloseTabButtonColor() for pre-refresh touchable.

Bug: 868169
Change-Id: I9adeed2a4fd8d57d3ae26e7885f66eb3bcfcd85d
Reviewed-on: https://chromium-review.googlesource.com/1153581
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#578769}

chrome/browser/ui/views/tabs/tab.cc

@@ -1683,9 +1683,10 @@ void Tab::OnButtonColorMaybeChanged() {
     title_->SetEnabledColor(title_color);
     alert_indicator_button_->OnParentTabButtonColorChanged();
   }
-  SkColor icon_color = MD::IsNewerMaterialUi()
-                           ? GetCloseTabButtonColor(views::Button::STATE_NORMAL)
-                           : button_color_;
+  SkColor icon_color =
+      MD::GetMode() == ui::MaterialDesignController::MATERIAL_TOUCH_OPTIMIZED
+          ? GetCloseTabButtonColor(views::Button::STATE_NORMAL)
+          : button_color_;
   close_button_->SetIconColors(icon_color);
 }