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

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

Index: chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
index da2b45113ef2964f0f46f5a496a6a1ca0a617b63..48fa79ab0bd1edf31b800bd4c258e76fc0408327 100644
--- a/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
@@ -28,6 +28,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/scoped_ns_graphics_context_state_mac.h"
 
 namespace {
 
@@ -823,10 +824,9 @@ bool AutocompletePopupViewMac::ShouldShowInstantOptIn() {
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
-  [NSGraphicsContext saveGraphicsState];
+  gfx::ScopedNSGraphicsContextState scopedGState;
   [path addClip];
   [super drawRect:rect];
-  [NSGraphicsContext restoreGraphicsState];
 }
 
 @end