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

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

Index: chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
index d19786042d7c50078a3d14adbb39eb0ec5623624..3c5f901b72ed036477b6ad5b83d70f450f006199 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm
@@ -24,6 +24,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image.h"
+#include "ui/gfx/scoped_ns_graphics_context_state_mac.h"
 
 namespace {
 
@@ -339,8 +340,7 @@ void ContentSettingDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
       gradient_.reset([[NSGradient alloc] initWithColors:color_array]);
     }
 
-    NSGraphicsContext* context = [NSGraphicsContext currentContext];
-    [context saveGraphicsState];
+    gfx::ScopedNSGraphicsContextState scopedGState;
 
     NSRectClip(frame);
 
@@ -369,8 +369,6 @@ void ContentSettingDecoration::DrawInFrame(NSRect frame, NSView* control_view) {
     NSInsetRect(remainder, kTextMarginPadding, kTextMarginPadding);
     // .get() needed to fix compiler warning (confusion with NSImageRep).
     [animated_text_.get() drawAtPoint:remainder.origin];
-
-    [context restoreGraphicsState];
   } else {
     // No animation, draw the image as normal.
     ImageDecoration::DrawInFrame(frame, control_view);