Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/theme_properties.h

Index: chrome/browser/themes/theme_properties.h
diff --git a/chrome/browser/themes/theme_properties.h b/chrome/browser/themes/theme_properties.h
index 83c719cb0beb2d235c08d4510a76d48e1819c267..f4070ccecab0ce6460271ecf4eb9e6fd11d742c0 100644
--- a/chrome/browser/themes/theme_properties.h
+++ b/chrome/browser/themes/theme_properties.h
@@ -82,11 +82,9 @@ class ThemeProperties {
   // The enum takes on values >= 1000 as not to overlap with
   // OverwritableByUserThemeProperties.
   enum NotOverwritableByUserThemeProperty {
-    COLOR_CONTROL_BACKGROUND = 1000,
-
     // The color of the line separating the bottom of the toolbar from the
     // contents.
-    COLOR_TOOLBAR_BOTTOM_SEPARATOR,
+    COLOR_TOOLBAR_BOTTOM_SEPARATOR = 1000,
 
     // The color of a normal toolbar button's icon.
     COLOR_TOOLBAR_BUTTON_ICON,
@@ -111,7 +109,6 @@ class ThemeProperties {
     COLOR_BOOKMARK_BAR_INSTRUCTIONS_TEXT,
 
     // Colors used for the detached (NTP) bookmark bar.
-    COLOR_DETACHED_BOOKMARK_BAR_BACKGROUND,
     COLOR_DETACHED_BOOKMARK_BAR_SEPARATOR,
 
     // The throbber colors for tabs or anything on a toolbar (currently, only