Merge 83125 - Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_st...

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

Index: chrome/browser/autocomplete/autocomplete_popup_view_mac.mm
===================================================================
--- chrome/browser/autocomplete/autocomplete_popup_view_mac.mm	(revision 84308)
+++ chrome/browser/autocomplete/autocomplete_popup_view_mac.mm	(working copy)
@@ -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_save_gstate_mac.h"
 
 namespace {
 
@@ -823,10 +824,9 @@
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
-  [NSGraphicsContext saveGraphicsState];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [path addClip];
   [super drawRect:rect];
-  [NSGraphicsContext restoreGraphicsState];
 }
 
 @end