Slightly simplify location bar bg/border painting.

chrome/browser/ui/views/location_bar/location_bar_view.h

Index: chrome/browser/ui/views/location_bar/location_bar_view.h
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 1d9b7a4753254a4db0faf39c4626446364eb032b..235701bb2935d1e0d6d1b5460b4b500d9cb24c55 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -127,9 +127,9 @@ class LocationBarView : public LocationBar,
 
   ~LocationBarView() override;
 
-  // Returns the color for the location bar border given the window's
-  // |incognito| state.
-  static SkColor GetBorderColor(bool incognito);
+  // Returns the location bar border color blended with the toolbar color.
+  // It's guaranteed to be opaque.
+  static SkColor GetOpaqueBorderColor(bool incognito);
 
   // Initializes the LocationBarView.
   void Init();
@@ -369,6 +369,7 @@ class LocationBarView : public LocationBar,
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
   void OnFocus() override;
   void OnPaint(gfx::Canvas* canvas) override;
+  void OnPaintBorder(gfx::Canvas* canvas) override;
 
   // views::DragController:
   void WriteDragDataForView(View* sender,