[Mac][Material Design] Bring Omnibox stroke and MD colors up to spec.

chrome/browser/themes/theme_service_mac.mm

 // Copyright (c) 2011 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/theme_service.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
 #include "chrome/browser/themes/browser_theme_pack.h"
@@ skipping 165 matching lines @@
 
 bool ThemeService::HasCustomColor(int id) const {
   SkColor color;
   return theme_supplier_ && theme_supplier_->GetColor(id, &color);
 }
 
 NSColor* ThemeService::GetNSColor(int id, bool incognito) const {
   DCHECK(CalledOnValidThread());
 
   int original_id = id;
-  if (ui::MaterialDesignController::IsModeMaterial() && incognito) {
+  const bool kIsModeMaterial = ui::MaterialDesignController::IsModeMaterial();

[sky, 2016/05/26 22:32:57]

mode_material as this isn't a compile time constant (like
kMaterialDesignIdOffset above).

[shrike, 2016/05/31 16:26:34]

Acknowledged.

+  if (kIsModeMaterial && incognito) {
     id += kMaterialDesignIdOffset;
   }
 
   // Check to see if we already have the color in the cache.
   NSColorMap::const_iterator nscolor_iter = nscolor_cache_.find(id);
   if (nscolor_iter != nscolor_cache_.end())
     return nscolor_iter->second;
 
   SkColor sk_color = GetColor(original_id, incognito);
-  NSColor* color = skia::SkColorToCalibratedNSColor(sk_color);
+  NSColor* color = nil;
+  if (kIsModeMaterial) {
+    color = skia::SkColorToSRGBNSColor(sk_color);
+  } else {
+    color = skia::SkColorToCalibratedNSColor(sk_color);
+  }
 
   // We loaded successfully.  Cache the color.
   if (color)
     nscolor_cache_[id] = [color retain];
 
   return color;
 }
 
 NSColor* ThemeService::GetNSColorTint(int id) const {
   DCHECK(CalledOnValidThread());
@@ skipping 185 matching lines @@
   return theme_service_.GetNSColor(id, incognito_);
 }
 
 NSColor* ThemeService::BrowserThemeProvider::GetNSColorTint(int id) const {
   return theme_service_.GetNSColorTint(id);
 }
 
 NSGradient* ThemeService::BrowserThemeProvider::GetNSGradient(int id) const {
   return theme_service_.GetNSGradient(id);
 }