Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_state_mac.h).

chrome/browser/ui/cocoa/find_bar/find_bar_view.mm

Index: chrome/browser/ui/cocoa/find_bar/find_bar_view.mm
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_view.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_view.mm
index 520902b411f2f68ee8ec6e57a35c9821309513bb..3acb2a25a30541c1b8afcc203fab092ba4e14d5e 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_view.mm
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_view.mm
@@ -8,6 +8,7 @@
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
+#include "ui/gfx/scoped_ns_graphics_context_state_mac.h"
 
 namespace {
 CGFloat kCurveSize = 8;
@@ -61,16 +62,18 @@ CGFloat kCurveSize = 8;
   [path curveToPoint:topRight
         controlPoint1:NSMakePoint(midRight2.x, topLeft.y)
         controlPoint2:NSMakePoint(midRight2.x, topLeft.y)];
-  NSGraphicsContext* context = [NSGraphicsContext currentContext];
-  [context saveGraphicsState];
-  [path addClip];
 
-  // Set the pattern phase
-  NSPoint phase = [[self window] themePatternPhase];
+  {
+    NSGraphicsContext* context = [NSGraphicsContext currentContext];
+    gfx::ScopedNSGraphicsContextState scopedGState(context);
+    [path addClip];
 
-  [context setPatternPhase:phase];
-  [super drawBackground];
-  [context restoreGraphicsState];
+    // Set the pattern phase
+    NSPoint phase = [[self window] themePatternPhase];
+
+    [context setPatternPhase:phase];
+    [super drawBackground];
+  }
 
   [[self strokeColor] set];
   [path setLineWidth:lineWidth];