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

chrome/browser/autocomplete/autocomplete_popup_view_mac.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <cmath>
 
 #include "chrome/browser/autocomplete/autocomplete_popup_view_mac.h"
 
 #include "base/stl_util-inl.h"
 #include "base/sys_string_conversions.h"
@@ skipping 10 matching lines @@
 #import "chrome/browser/ui/cocoa/location_bar/instant_opt_in_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/instant_opt_in_view.h"
 #import "chrome/browser/ui/cocoa/location_bar/omnibox_popup_view.h"
 #include "grit/theme_resources.h"
 #include "skia/ext/skia_utils_mac.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 #import "third_party/GTM/AppKit/GTMNSBezierPath+RoundRect.h"
 #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 {
 
 // The size delta between the font used for the edit and the result
 // rows.
 const int kEditFontAdjust = -1;
 
 // How much to adjust the cell sizing up from the default determined
 // by the font.
 const int kCellHeightAdjust = 6.0;
@@ skipping 775 matching lines @@
 
   // "Top" really means "bottom" here, since the view is flipped.
   NSBezierPath* path =
      [NSBezierPath gtm_bezierPathWithRoundRect:[self bounds]
                            topLeftCornerRadius:bottomCornerRadius
                           topRightCornerRadius:bottomCornerRadius
                         bottomLeftCornerRadius:kPopupRoundingRadius
                        bottomRightCornerRadius:kPopupRoundingRadius];
 
   // Draw the matrix clipped to our border.
-  [NSGraphicsContext saveGraphicsState];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
   [path addClip];
   [super drawRect:rect];
-  [NSGraphicsContext restoreGraphicsState];
 }
 
 @end