Reland: Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/ui/webui/ntp/ntp_resource_cache.cc

Index: chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
index e67d28ea4152f4aa4785c2b8c15b344cbd83a248..cf6dff4e99a1d5b3663f1ae1d523743e475b4c3f 100644
--- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
+++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc
@@ -506,10 +506,9 @@ void NTPResourceCache::CreateNewTabIncognitoCSS() {
       ThemeService::GetThemeProviderForProfile(profile_);
 
   // Get our theme colors
-  SkColor color_background =
-      tp.HasCustomImage(IDR_THEME_NTP_BACKGROUND)
-          ? GetThemeColor(tp, ThemeProperties::COLOR_NTP_BACKGROUND)
-          : SkColorSetRGB(0x32, 0x32, 0x32);
+  SkColor color_background = ThemeProperties::GetDefaultColor(
+      ThemeProperties::COLOR_NTP_BACKGROUND,
+      !tp.HasCustomImage(IDR_THEME_NTP_BACKGROUND));

[Peter Kasting, 2016/08/18 09:12:36]

This seems like a behavior change -- before, if the theme had a custom NTP
background image, we used the theme's NTP background color, modulated by the
inversion code in GetThemeColor().  (This seems weird, BTW.  Do we display the
theme's NTP for incognito NTPs if the theme has a custom background, but display
the normal placeholder otherwise?)

Now, you use the default NTP background colors in either case, ignoring the
theme ones and the inversion code in GetThemeColor(), you just toggle between
normal and incognito color sets based on if the theme has a custom image.  If
the old behavior was strange, this seems even stranger.

 
   // Generate the replacements.
   ui::TemplateReplacements substitutions;