Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/browser_theme_pack_unittest.cc

Index: chrome/browser/themes/browser_theme_pack_unittest.cc
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index 581cefbbd6bf36c72af5320dc8977835229ea667..4d3f144d3208c1eef430c5ab4b312b09158773e1 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -248,8 +248,6 @@ class BrowserThemePackTest : public ::testing::Test {
 #endif
 
     // Make sure we don't have phantom data.
-    EXPECT_FALSE(pack->GetColor(ThemeProperties::COLOR_CONTROL_BACKGROUND,
-                                &color));
     EXPECT_FALSE(pack->GetTint(ThemeProperties::TINT_FRAME, &actual));
   }
 
@@ -439,6 +437,7 @@ TEST_F(BrowserThemePackTest, SupportsAlpha) {
       "  \"tab_text\": [60, 80, 100, 1], "
       "  \"tab_background_text\": [120, 140, 160, 0.0], "
       "  \"bookmark_text\": [180, 200, 220, 1.0], "
+      "  \"ntp_background\": [20, 50, 140, 0.2], "
       "  \"ntp_text\": [240, 255, 0, 0.5] }";
   LoadColorJSON(color_json);
 
@@ -451,6 +450,8 @@ TEST_F(BrowserThemePackTest, SupportsAlpha) {
       SkColorSetARGB(0, 120, 140, 160);
   colors[ThemeProperties::COLOR_BOOKMARK_TEXT] =
       SkColorSetARGB(255, 180, 200, 220);
+  // Verify that the theme machinery forces ntp_background color to be opaque.

[Peter Kasting, 2016/07/11 01:41:58]

Nit: Let's combine the toolbar and NTP background color checks into one block
below the other color checks, with one comment, a la "The theme machinery forces
these colors to be opaque."

[Julien Isorce Samsung, 2016/07/13 15:01:32]

Done.

+  colors[ThemeProperties::COLOR_NTP_BACKGROUND] = SkColorSetRGB(20, 50, 140);
   colors[ThemeProperties::COLOR_NTP_TEXT] = SkColorSetARGB(128, 240, 255, 0);
   VerifyColorMap(colors);
 }