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

chrome/browser/themes/theme_service_mac.mm

Index: chrome/browser/themes/theme_service_mac.mm
diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm
index a5654b94eff35a438fc1f8dfdb8cf49d10a3d705..56e7f5f48d9b3c3b3f2b8272cdcb6b22f485c308 100644
--- a/chrome/browser/themes/theme_service_mac.mm
+++ b/chrome/browser/themes/theme_service_mac.mm
@@ -183,8 +183,7 @@
   DCHECK(CalledOnValidThread());
 
   int original_id = id;
-  const bool is_mode_material = ui::MaterialDesignController::IsModeMaterial();
-  if (is_mode_material && incognito) {
+  if (ui::MaterialDesignController::IsModeMaterial() && incognito) {
     id += kMaterialDesignIdOffset;
   }
 
@@ -194,12 +193,7 @@
     return nscolor_iter->second;
 
   SkColor sk_color = GetColor(original_id, incognito);
-  NSColor* color = nil;
-  if (is_mode_material) {
-    color = skia::SkColorToSRGBNSColor(sk_color);
-  } else {
-    color = skia::SkColorToCalibratedNSColor(sk_color);
-  }
+  NSColor* color = skia::SkColorToCalibratedNSColor(sk_color);
 
   // We loaded successfully.  Cache the color.
   if (color)