Update patches for Chromium 67.0.3396.103

Fix brave/brave-browser#437

patches/base-mac-foundation_util.mm.patch

@@ -2,7 +2,7 @@ diff --git a/base/mac/foundation_util.mm b/base/mac/foundation_util.mm
 index aec8c0f6398ce65dd70681cfe94ecee9ba8a1c1e..4f6e728b8da3586e44216bd16fa6890f245b67a2 100644
 --- a/base/mac/foundation_util.mm
 +++ b/base/mac/foundation_util.mm
-@@ -250,7 +250,7 @@ void NSObjectRelease(void* obj) {
+@@ -250,7 +250,7 @@ const char* BaseBundleID() {
  #if defined(GOOGLE_CHROME_BUILD)
    return "com.google.Chrome";
  #else

patches/chrome-browser-ui-cocoa-app_menu-app_menu_controller.mm.patch

@@ -10,7 +10,7 @@ index 89f8b4bbba39c990b65c62159a00e51eff0b53ab..094303f8643eb1471a77a2b5e3e8e3d8
  #include "chrome/app/chrome_command_ids.h"
  #import "chrome/browser/app_controller_mac.h"
  #include "chrome/browser/profiles/profile.h"
-@@ -495,7 +496,7 @@ - (BrowserActionsController*)browserActionsController {
+@@ -495,7 +496,7 @@ class ToolbarActionsBarObserverHelper : public ToolbarActionsBarObserver {
  - (void)createModel {
    DCHECK(browser_);
    recentTabsMenuModelDelegate_.reset();

patches/chrome-browser-ui-cocoa-new_tab_button_cocoa.mm.patch

@@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/new_tab_button_cocoa.mm b/chrome/browser/ui
 index 767e405a0c4d5142fa1099968c6e1d0e66a6d201..f10353e69d4e1242595a38d8a937144cc3022690 100644
 --- a/chrome/browser/ui/cocoa/new_tab_button_cocoa.mm
 +++ b/chrome/browser/ui/cocoa/new_tab_button_cocoa.mm
-@@ -25,7 +25,7 @@
+@@ -25,7 +25,7 @@ enum class OverlayOption {
    DARKEN,
  };
 
@@ -11,7 +11,7 @@ index 767e405a0c4d5142fa1099968c6e1d0e66a6d201..f10353e69d4e1242595a38d8a937144c
 
  NSImage* GetMaskImageFromCell(NewTabButtonCell* aCell) {
    return [aCell imageForState:image_button_cell::kDefaultState view:nil];
-@@ -346,34 +346,30 @@ - (NSImage*)imageForState:(image_button_cell::ButtonState)state
+@@ -346,34 +346,30 @@ CGFloat LineWidthFromContext(CGContextRef context) {
  + (NSBezierPath*)newTabButtonBezierPathWithLineWidth:(CGFloat)lineWidth {
    NSBezierPath* bezierPath = [NSBezierPath bezierPath];
 
@@ -65,7 +65,7 @@ index 767e405a0c4d5142fa1099968c6e1d0e66a6d201..f10353e69d4e1242595a38d8a937144c
 
    [bezierPath closePath];
 
-@@ -431,9 +427,10 @@ + (void)drawNewTabButtonImage:(NewTabButtonCustomImageRep*)imageRep
+@@ -431,9 +427,10 @@ CGFloat LineWidthFromContext(CGContextRef context) {
    CGFloat buttonWidth = newTabButtonImageSize.width;
 
    // Bottom edge.
@@ -78,7 +78,7 @@ index 767e405a0c4d5142fa1099968c6e1d0e66a6d201..f10353e69d4e1242595a38d8a937144c
    NSPoint bottomEdgeStart = NSMakePoint(kBottomEdgeX, kBottomEdgeY);
    NSPoint bottomEdgeEnd = NSMakePoint(kBottomEdgeX + kBottomEdgeWidth,
                                        kBottomEdgeY);
-@@ -454,11 +451,11 @@ + (void)drawNewTabButtonImage:(NewTabButtonCustomImageRep*)imageRep
+@@ -454,11 +451,11 @@ CGFloat LineWidthFromContext(CGContextRef context) {
    CGPoint shadowStart = NSZeroPoint;
    CGPoint shadowEnd = NSZeroPoint;
    NSColor* overlayColor = nil;

patches/chrome-browser-ui-cocoa-tabs-tab_controller.mm.patch

@@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/
 index 0c1473bf9880e543ebbb45f7795f7412b348948d..c1b1f17cde3fef138b983fedd9a9592103cc519d 100644
 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm
 +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
-@@ -117,8 +117,8 @@ @implementation TabController
+@@ -117,8 +117,8 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  @synthesize url = url_;
 
  namespace {

patches/chrome-browser-ui-cocoa-tabs-tab_strip_controller.mm.patch

@@ -2,7 +2,7 @@ diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/brows
 index 8f0fc0a5711f1f011b90c1cbcb27d78977d70263..b9ec879393c5029b34650455b8d594ca929f6cbe 100644
 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
 +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm
-@@ -92,7 +92,7 @@
+@@ -92,7 +92,7 @@ const CGFloat kUseFullAvailableWidth = -1.0;
  const CGFloat kLastPinnedTabSpacing = 2.0;
 
  // The amount by which the new tab button is offset (from the tabs).
@@ -11,7 +11,7 @@ index 8f0fc0a5711f1f011b90c1cbcb27d78977d70263..b9ec879393c5029b34650455b8d594ca
 
  const NSTimeInterval kAnimationDuration = 0.125;
 
-@@ -592,7 +592,7 @@ + (CGFloat)tabOverlap {
+@@ -592,7 +592,7 @@ NSRect FlipRectInView(NSView* view, NSRect rect) {
    // tab. Else, every time the throbber is painted, the throbber's invalidation
    // will also invalidate parts of the tab to the left, and two tabs's
    // backgrounds need to be painted on each throbber frame instead of one.

patches/chrome-browser-ui-cocoa-tabs-tab_view.mm.patch

@@ -2,23 +2,23 @@ diff --git a/chrome/browser/ui/cocoa/tabs/tab_view.mm b/chrome/browser/ui/cocoa/
 index 9021a2ce3a706576546fb1f9b77207a4e24d9665..516a06ead1fd17f802ba122384621c585b01d818 100644
 --- a/chrome/browser/ui/cocoa/tabs/tab_view.mm
 +++ b/chrome/browser/ui/cocoa/tabs/tab_view.mm
-@@ -451,7 +451,6 @@ - (NSColor*)backgroundColorForSelected:(bool)selected {
+@@ -451,7 +451,6 @@ CGFloat LineWidthFromContext(CGContextRef context) {
  - (void)drawFill:(NSRect)dirtyRect {
    gfx::ScopedNSGraphicsContextSaveGState scopedGState;
    NSRect bounds = [self bounds];
 -
    NSRect clippingRect = bounds;
    clippingRect.size.height = [TabView maskImageFillHeight];
    if (state_ != NSOnState) {
-@@ -937,6 +936,7 @@ - (void)adjustGlowValue {
+@@ -937,6 +936,7 @@ CGFloat LineWidthFromContext(CGContextRef context) {
  @implementation TabImageMaker
 
  + (NSBezierPath*)tabLeftEdgeBezierPathForContext:(CGContextRef)context {
 +
    NSBezierPath* bezierPath = [NSBezierPath bezierPath];
 
    [bezierPath moveToPoint:NSMakePoint(-2, 0)];
-@@ -944,10 +944,11 @@ + (NSBezierPath*)tabLeftEdgeBezierPathForContext:(CGContextRef)context {
+@@ -944,10 +944,11 @@ CGFloat LineWidthFromContext(CGContextRef context) {
               controlPoint1:NSMakePoint(1.805, -0.38)
               controlPoint2:NSMakePoint(2.17, 1.415)];
 
@@ -34,7 +34,7 @@ index 9021a2ce3a706576546fb1f9b77207a4e24d9665..516a06ead1fd17f802ba122384621c58
 
    [bezierPath lineToPoint:NSMakePoint(18, 29)];
 
-@@ -977,6 +978,7 @@ + (NSBezierPath*)tabLeftEdgeBezierPathForContext:(CGContextRef)context {
+@@ -977,6 +978,7 @@ CGFloat LineWidthFromContext(CGContextRef context) {
  }
 
  + (void)setTabEdgeStrokeColor {

patches/chrome-common-channel_info_mac.mm.patch

@@ -11,7 +11,7 @@ index 0124634998da23dee70c687fbce09189a070006f..1001697a09c7465c17652eb4d9c8ca3a
    // Use the main Chrome application bundle and not the framework bundle.
    // Keystone keys don't live in the framework.
    NSBundle* bundle = base::mac::OuterBundle();
-@@ -21,10 +21,14 @@
+@@ -21,10 +21,14 @@ std::string GetChannelName() {
 
    // Only ever return "", "unknown", "beta", "dev", or "canary" in a branded
    // build.
@@ -26,7 +26,7 @@ index 0124634998da23dee70c687fbce09189a070006f..1001697a09c7465c17652eb4d9c8ca3a
      // For the stable channel, KSChannelID is not set.
      channel = @"";
    } else if ([channel isEqual:@"beta"] ||
-@@ -42,8 +46,7 @@
+@@ -42,8 +46,7 @@ std::string GetChannelName() {
  }
 
  version_info::Channel GetChannelByName(const std::string& channel) {

patches/chrome-common-chrome_paths_mac.mm.patch

@@ -13,7 +13,7 @@ index cca3bbb41ae25484c3e87c9aba09a8b07741e2b2..e8e1e65109f1d9f7e11b4e080779c525
  namespace {
 
  const base::FilePath* g_override_versioned_directory = NULL;
-@@ -58,6 +62,16 @@
+@@ -58,6 +62,16 @@ char* ProductDirNameForBundle(NSBundle* chrome_bundle) {
    if (!product_dir_name) {
  #if defined(GOOGLE_CHROME_BUILD)
      product_dir_name = "Google/Chrome";

patches/components-os_crypt-keychain_password_mac.mm.patch

@@ -10,7 +10,7 @@ index 2b38db266f9aa1f4141c8649c021042ede4e5589..4b14f15e5091b251be53eff29139beaa
  #include "base/mac/mac_logging.h"
  #include "base/rand_util.h"
  #include "crypto/apple_keychain.h"
-@@ -54,11 +55,23 @@
+@@ -54,11 +55,23 @@ std::string AddRandomPasswordToKeychain(const AppleKeychain& keychain,
  const char KeychainPassword::service_name[] = "Chrome Safe Storage";
  const char KeychainPassword::account_name[] = "Chrome";
  #else