cocoa browser: remove non-MD location bar support

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
index 725668fdbedc0748628cfb67e1ebc6fd1b337794..fd005bf7f945ad122710570ea0b622c1e07200b7 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
@@ -67,11 +67,7 @@
 // subtracting kBorderPadding from 8px.
 const CGFloat kRightDividerPadding = 8.0;
 const CGFloat kLeftDividerPadding = 5.0;
-CGFloat DividerPadding() {
-  return ui::MaterialDesignController::IsModeMaterial()
-             ? kLeftDividerPadding + kRightDividerPadding
-             : 0.0;
-}
+const CGFloat kDividerPadding = kLeftDividerPadding + kRightDividerPadding;
 
 // Color of the vector graphic icons. Used when the location is not dark.
 // SkColorSetARGB(0xCC, 0xFF, 0xFF 0xFF);
@@ -343,7 +339,7 @@ - (void)timerFired:(NSTimer*)timer {
       preferred_width += kIconMarginPadding + kTextMarginPadding;
 
       // Add the width of the text based on the state of the animation.
-      CGFloat text_width = text_width_ + DividerPadding();
+      CGFloat text_width = text_width_ + kDividerPadding;
       switch (state) {
         case kOpening:
           preferred_width += text_width * kInMotionMultiplier * progress;
@@ -375,13 +371,6 @@ - (void)timerFired:(NSTimer*)timer {
     // this ContentSettingDecoration's DrawInFrame() also draws the background.
     // In short, moving this code upstream to a common parent requires a non-
     // trivial bit of refactoring.
-    if (!ui::MaterialDesignController::IsModeMaterial()) {
-      const ui::NinePartImageIds image_ids =
-          IMAGE_GRID(IDR_OMNIBOX_CONTENT_SETTING_BUBBLE);
-      ui::DrawNinePartImage(
-          background_rect, image_ids, NSCompositeSourceOver, 1.0, true);
-    }
-
     // Draw the icon.
     NSImage* icon = GetImage();
     NSRect icon_rect = background_rect;
@@ -397,18 +386,14 @@ - (void)timerFired:(NSTimer*)timer {
         NSMaxX(background_rect) - NSMinX(remainder) - kLeftDividerPadding;
     DrawAttributedString(animated_text_, remainder);
 
-    if (ui::MaterialDesignController::IsModeMaterial()) {
-      NSBezierPath* line = [NSBezierPath bezierPath];
-      [line setLineWidth:1];
-      [line
-          moveToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
+    NSBezierPath* line = [NSBezierPath bezierPath];
+    [line setLineWidth:1];
+    [line moveToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
                                   NSMinY(background_rect))];
-      [line
-          lineToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
+    [line lineToPoint:NSMakePoint(NSMaxX(background_rect) - kLeftDividerPadding,
                                   NSMaxY(background_rect))];
-      [GetDividerColor(owner_->IsLocationBarDark()) set];
-      [line stroke];
-    }
+    [GetDividerColor(owner_->IsLocationBarDark()) set];
+    [line stroke];
   } else {
     // No animation, draw the image as normal.
     ImageDecoration::DrawInFrame(frame, control_view);