NTPResourceCache don't add substitution for colorSectionBorder twice

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

 // Copyright 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/ui/webui/ntp/ntp_resource_cache.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 561 matching lines @@
 
   // Colors.
   substitutions["colorBackground"] = SkColorToRGBAString(color_background);
   substitutions["backgroundBarDetached"] = GetNewTabBackgroundCSS(tp, false);
   substitutions["backgroundBarAttached"] = GetNewTabBackgroundCSS(tp, true);
   substitutions["backgroundTiling"] = GetNewTabBackgroundTilingCSS(tp);
   substitutions["colorTextRgba"] = SkColorToRGBAString(color_text);
   substitutions["colorSectionBorder"] =
       SkColorToRGBAString(color_section_border);
   substitutions["colorTextLight"] = SkColorToRGBAString(color_text_light);
-  substitutions["colorSectionBorder"] =
-      SkColorToRGBComponents(color_section_border);

[Peter Kasting, 2016/10/27 22:29:10]

The first addition was as a string, this one as components.  Is it clear the
first one is the correct one?

[hans, 2016/10/27 22:44:38]

Hmm, you're right. I was assuming an RGBA string and components would be
functionally equivalent, but I don't really know that of course. The more
defensive thing would be to remove the first addition.

I'd like to hear what dschuyler thinks.

[dschuyler, 2016/10/27 23:07:34]

I think that I didn't notice that there were two
places that color_selection_border was being set previously. My apologies.

https://codereview.chromium.org/1220793010/diff/490001/chrome/browser/ui/webu...

When I ported the code to 'the new way', it brought that weird aspect forward.
IMO, the safer thing to do would be to keep the latter entry. That (I
believe) is the one that is currently active - it will have been 
stomping the former entry.

[hans, 2016/10/27 23:13:07]

Sounds good to me. New patch uploaded.

   substitutions["colorText"] = SkColorToRGBComponents(color_text);
 
   // For themes that right-align the background, we flip the attribution to the
   // left to avoid conflicts.
   int alignment =
       tp.GetDisplayProperty(ThemeProperties::NTP_BACKGROUND_ALIGNMENT);
   if (alignment & ThemeProperties::ALIGN_RIGHT) {
     substitutions["leftAlignAttribution"] = "0";
     substitutions["rightAlignAttribution"] = "auto";
     substitutions["textAlignAttribution"] = "right";
   } else {
     substitutions["leftAlignAttribution"] = "auto";
     substitutions["rightAlignAttribution"] = "0";
     substitutions["textAlignAttribution"] = "left";
   }
 
   substitutions["displayAttribution"] =
       tp.HasCustomImage(IDR_THEME_NTP_ATTRIBUTION) ? "inline" : "none";
 
   // Get our template.
   static const base::StringPiece new_tab_theme_css(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_NEW_TAB_4_THEME_CSS));
 
   // Create the string from our template and the replacements.
   std::string css_string =
       ui::ReplaceTemplateExpressions(new_tab_theme_css, substitutions);
   new_tab_css_ = base::RefCountedString::TakeString(&css_string);
 }