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

chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.mm

 // Copyright 2013 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.
 
 #import "chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <cmath>
@@ skipping 94 matching lines @@
 NSColor* DimTextColor(BOOL is_dark_theme) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [NSColor darkGrayColor];
   }
   if (is_dark_theme) {
     return skia::SkColorToSRGBNSColor(SkColorSetA(SK_ColorWHITE, 0x7F));
   }
   return skia::SkColorToSRGBNSColor(SkColorSetRGB(0x64, 0x64, 0x64));
 }
 NSColor* PositiveTextColor() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return skia::SkColorToCalibratedNSColor(SkColorSetRGB(0x3d, 0x94, 0x00));
-  }
-  return skia::SkColorToSRGBNSColor(SkColorSetRGB(0x3d, 0x94, 0x00));
+  return skia::SkColorToCalibratedNSColor(SkColorSetRGB(0x3d, 0x94, 0x00));
 }
 NSColor* NegativeTextColor() {
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    return skia::SkColorToCalibratedNSColor(SkColorSetRGB(0xdd, 0x4b, 0x39));
-  }
-  return skia::SkColorToSRGBNSColor(SkColorSetRGB(0xdd, 0x4b, 0x39));
+  return skia::SkColorToCalibratedNSColor(SkColorSetRGB(0xdd, 0x4b, 0x39));
 }
 NSColor* URLTextColor(BOOL is_dark_theme) {
   if (!ui::MaterialDesignController::IsModeMaterial()) {
     return [NSColor colorWithCalibratedRed:0.0 green:0.55 blue:0.0 alpha:1.0];
   }
   return is_dark_theme ? skia::SkColorToSRGBNSColor(gfx::kGoogleBlue300)
                        : skia::SkColorToSRGBNSColor(gfx::kGoogleBlue700);
 }
 
 NSFont* FieldFont() {
@@ skipping 580 matching lines @@
   return base::i18n::IsRTL() ? (inputWidth - glyphOffset) : glyphOffset;
 }
 
 + (NSAttributedString*)createSeparatorStringForDarkTheme:(BOOL)isDarkTheme {
   base::string16 raw_separator =
       l10n_util::GetStringUTF16(IDS_AUTOCOMPLETE_MATCH_DESCRIPTION_SEPARATOR);
   return CreateAttributedString(raw_separator, DimTextColor(isDarkTheme));
 }
 
 @end