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

chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.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.
 
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_button_cocoa.h"
 
 #include "base/mac/foundation_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #import "chrome/browser/ui/cocoa/image_button_cell.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
@@ skipping 217 matching lines @@
   return themeIsDark ? SK_ColorWHITE : SkColorSetRGB(0x5A, 0x5A, 0x5A);
 }
 
 - (NSImage*)browserToolsIconForFillColor:(SkColor)fillColor {
   // Create a |BrowserToolsImageRep| to draw the browser tools icon using
   // the provided fill color.
   base::scoped_nsobject<BrowserToolsImageRep> imageRep =
   [[BrowserToolsImageRep alloc]
       initWithDrawSelector:@selector(drawBrowserToolsIcon:)
                   delegate:[BrowserToolsImageRep class]];
-  if (!ui::MaterialDesignController::IsModeMaterial()) {
-    [imageRep setFillColor:skia::SkColorToCalibratedNSColor(fillColor)];
-  } else {
-    [imageRep setFillColor:skia::SkColorToSRGBNSColor(fillColor)];
-  }
+  [imageRep setFillColor:skia::SkColorToCalibratedNSColor(fillColor)];
 
   // Create the image from the image rep.
   NSImage* browserToolsIcon =
       [[[NSImage alloc] initWithSize:kMDButtonIconSize] autorelease];
   [browserToolsIcon setCacheMode:NSImageCacheAlways];
   [browserToolsIcon addRepresentation:imageRep];
 
   return browserToolsIcon;
 }
 
@@ skipping 141 matching lines @@
   // Update the hover and pressed image backgrounds to match the current theme.
   if (ui::MaterialDesignController::IsModeMaterial()) {
     [self resetButtonStateImages];
   }
 }
 
 - (void)windowDidChangeActive {
 }
 
 @end