Clean up ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT

ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT is no longer in use,
because BookmarkBarInstructionView is removed. However, it still remains,
so it is cleaned up.

Bug: NONE
Change-Id: I7ce14646fafaf07fc426aa96d1b4dab073b51ca4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1506679Reviewed-by: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Cr-Commit-Position: refs/heads/master@{#638639}

chrome/browser/themes/theme_properties.cc

@@ -68,8 +68,6 @@ base::Optional<SkColor> GetIncognitoColor(int id) {
       return gfx::kGoogleGrey600;
     case ThemeProperties::COLOR_CONTROL_BACKGROUND:
       return SK_ColorWHITE;
-    case ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
-      return SkColorSetA(SK_ColorWHITE, 0x8A);
     case ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR:
       return SkColorSetRGB(0x28, 0x28, 0x28);
     default:
@@ -251,8 +249,6 @@ SkColor ThemeProperties::GetDefaultColor(int id, bool incognito) {
       return gfx::kGoogleBlue600;
     case COLOR_CONTROL_BACKGROUND:
       return SK_ColorWHITE;
-    case COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
-      return SkColorSetRGB(0x64, 0x64, 0x64);
     case COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR:
       // We shouldn't reach this case because the color is calculated from
       // others.

chrome/browser/themes/theme_properties.h

@@ -111,9 +111,6 @@ class ThemeProperties {
     // shelf.
     COLOR_TOOLBAR_VERTICAL_SEPARATOR,
 
-    // The color of the "instructions text" in an empty bookmarks bar.
-    COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT,
-
     // Colors used for the detached (NTP) bookmark bar.
     COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND,
     COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR,

chrome/browser/themes/theme_service.cc

@@ -555,10 +555,6 @@ SkColor ThemeService::GetDefaultColor(int id, bool incognito) const {
           GetColor(ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON, incognito),
           0x4D);
     }
-    case ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT:
-      if (UsingDefaultTheme())
-        break;
-      return GetColor(ThemeProperties::COLOR_BOOKMARK_TEXT, incognito);
     case ThemeProperties::COLOR_TOOLBAR_CONTENT_AREA_SEPARATOR:
       if (UsingDefaultTheme())
         break;

chrome/browser/ui/libgtkui/gtk_ui.cc

@@ -851,8 +851,6 @@ void GtkUi::UpdateColors() {
   colors_[ThemeProperties::COLOR_TOOLBAR_BUTTON_ICON] = tab_text_color;
   colors_[ThemeProperties::COLOR_TAB_TEXT] = tab_text_color;
   colors_[ThemeProperties::COLOR_BOOKMARK_TEXT] = tab_text_color;
-  colors_[ThemeProperties::COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT] =
-      tab_text_color;
 
   colors_[ThemeProperties::COLOR_BACKGROUND_TAB] = SK_ColorTRANSPARENT;
   colors_[ThemeProperties::COLOR_BACKGROUND_TAB_INACTIVE] = SK_ColorTRANSPARENT;