Revert of Replace CONTROL_BACKGROUND and DETACHED_BOOKMARK_BAR_BACKGROUND by COLOR_NTP_BACKGROUND

chrome/browser/themes/browser_theme_pack_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/browser_theme_pack.h"
 
 #include <stddef.h>
 
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 230 matching lines @@
     // they're included in the theme pack, they were autogenerated and
     // therefore shouldn't show up when calling HasCustomImage().
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INACTIVE));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO));
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO_INACTIVE));
 #if !defined(OS_MACOSX)
     EXPECT_FALSE(pack->HasCustomImage(IDR_THEME_TAB_BACKGROUND_INCOGNITO));
 #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));
   }
 
   void VerifyHiDpiTheme(BrowserThemePack* pack) {
     // The high DPI theme defines the following images:
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INACTIVE));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_FRAME_INCOGNITO_INACTIVE));
     EXPECT_TRUE(pack->HasCustomImage(IDR_THEME_TOOLBAR));
@@ skipping 165 matching lines @@
   LoadColorJSON(color_json);
 
   std::map<int, SkColor> colors = GetDefaultColorMap();
   colors[ThemeProperties::COLOR_NTP_HEADER] = SkColorSetRGB(120, 120, 120);
   colors[ThemeProperties::COLOR_NTP_SECTION] = SkColorSetRGB(190, 190, 190);
   VerifyColorMap(colors);
 }
 
 TEST_F(BrowserThemePackTest, SupportsAlpha) {
   std::string color_json =
-      "{ \"toolbar\": [0, 20, 40, 0.7], "
+      "{ \"toolbar\": [0, 20, 40, 1], "
       "  \"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);
 
   std::map<int, SkColor> colors = GetDefaultColorMap();
   // Verify that valid alpha values are parsed correctly.
+  // The toolbar color's alpha value is intentionally ignored by theme provider.
+  colors[ThemeProperties::COLOR_TOOLBAR] = SkColorSetARGB(255, 0, 20, 40);
   colors[ThemeProperties::COLOR_TAB_TEXT] = SkColorSetARGB(255, 60, 80, 100);
   colors[ThemeProperties::COLOR_BACKGROUND_TAB_TEXT] =
       SkColorSetARGB(0, 120, 140, 160);
   colors[ThemeProperties::COLOR_BOOKMARK_TEXT] =
       SkColorSetARGB(255, 180, 200, 220);
   colors[ThemeProperties::COLOR_NTP_TEXT] = SkColorSetARGB(128, 240, 255, 0);
-  // The theme machinery forces these colors to be opaque.
-  colors[ThemeProperties::COLOR_NTP_BACKGROUND] = SkColorSetRGB(20, 50, 140);
-  colors[ThemeProperties::COLOR_TOOLBAR] = SkColorSetRGB(0, 20, 40);
   VerifyColorMap(colors);
 }
 
 TEST_F(BrowserThemePackTest, OutOfRangeColors) {
   // Ensure colors with out-of-range values are simply ignored.
   std::string color_json = "{ \"toolbar\": [0, 20, 40, -1], "
                            "  \"tab_text\": [60, 80, 100, 2], "
                            "  \"tab_background_text\": [120, 140, 160, 47.6], "
                            "  \"bookmark_text\": [256, 0, 0], "
                            "  \"ntp_text\": [0, -100, 100] }";
@@ skipping 187 matching lines @@
   }
 
   // Part 2: Try to read back the data pack that we just wrote to disk.
   {
     scoped_refptr<BrowserThemePack> pack =
         BrowserThemePack::BuildFromDataPack(file, "gllekhaobjnhgeag");
     ASSERT_TRUE(pack.get());
     VerifyHiDpiTheme(pack.get());
   }
 }