Themes: Remove unused IDs from ThemeProperties

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 352 matching lines @@
   base::MessageLoop message_loop;
   content::TestBrowserThread fake_ui_thread;
   content::TestBrowserThread fake_file_thread;
 
   typedef std::unique_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
   scoped_refptr<BrowserThemePack> theme_pack_;
 };
 
-
-TEST_F(BrowserThemePackTest, DeriveUnderlineLinkColor) {
-  // If we specify a link color, but don't specify the underline color, the
-  // theme provider should create one.
-  std::string color_json = "{ \"ntp_link\": [128, 128, 128],"
-                           "  \"ntp_section_link\": [128, 128, 128] }";
-  LoadColorJSON(color_json);
-
-  std::map<int, SkColor> colors = GetDefaultColorMap();
-  SkColor link_color = SkColorSetRGB(128, 128, 128);
-  colors[ThemeProperties::COLOR_NTP_LINK] = link_color;
-  colors[ThemeProperties::COLOR_NTP_LINK_UNDERLINE] =
-      BuildThirdOpacity(link_color);
-  colors[ThemeProperties::COLOR_NTP_SECTION_LINK] = link_color;
-  colors[ThemeProperties::COLOR_NTP_SECTION_LINK_UNDERLINE] =
-      BuildThirdOpacity(link_color);
-
-  VerifyColorMap(colors);
-}
-
-TEST_F(BrowserThemePackTest, ProvideUnderlineLinkColor) {
-  // If we specify the underline color, it shouldn't try to generate one.
-  std::string color_json = "{ \"ntp_link\": [128, 128, 128],"
-                           "  \"ntp_link_underline\": [255, 255, 255],"
-                           "  \"ntp_section_link\": [128, 128, 128],"
-                           "  \"ntp_section_link_underline\": [255, 255, 255]"
-                           "}";
-  LoadColorJSON(color_json);
-
-  std::map<int, SkColor> colors = GetDefaultColorMap();
-  SkColor link_color = SkColorSetRGB(128, 128, 128);
-  SkColor underline_color = SkColorSetRGB(255, 255, 255);
-  colors[ThemeProperties::COLOR_NTP_LINK] = link_color;
-  colors[ThemeProperties::COLOR_NTP_LINK_UNDERLINE] = underline_color;
-  colors[ThemeProperties::COLOR_NTP_SECTION_LINK] = link_color;
-  colors[ThemeProperties::COLOR_NTP_SECTION_LINK_UNDERLINE] =
-      underline_color;
-
-  VerifyColorMap(colors);
-}
-
 TEST_F(BrowserThemePackTest, UseSectionColorAsNTPHeader) {

[Evan Stade, 2017/02/01 21:47:23]

nit: since this is sorta more subtle now, add a comment?

[Tom (Use chromium acct), 2017/02/01 23:09:30]

Done.

   std::string color_json = "{ \"ntp_section\": [190, 190, 190] }";
   LoadColorJSON(color_json);
 
   std::map<int, SkColor> colors = GetDefaultColorMap();
   SkColor ntp_color = SkColorSetRGB(190, 190, 190);
   colors[ThemeProperties::COLOR_NTP_HEADER] = ntp_color;
-  colors[ThemeProperties::COLOR_NTP_SECTION] = ntp_color;
   VerifyColorMap(colors);
 }
 
 TEST_F(BrowserThemePackTest, ProvideNtpHeaderColor) {
   std::string color_json = "{ \"ntp_header\": [120, 120, 120], "
                            "  \"ntp_section\": [190, 190, 190] }";
   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, 1], "
       "  \"tab_text\": [60, 80, 100, 1], "
       "  \"tab_background_text\": [120, 140, 160, 0.0], "
       "  \"bookmark_text\": [180, 200, 220, 1.0], "
       "  \"ntp_text\": [240, 255, 0, 0.5] }";
@@ skipping 209 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());
   }
 }