Revert 95611 - Always call the class methods to save/restore contexts.

chrome/browser/ui/cocoa/download/download_item_cell.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.
 
 #import "chrome/browser/ui/cocoa/download/download_item_cell.h"
 
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/download/download_item.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
@@ skipping 388 matching lines @@
   if (![secondaryColor gtm_isDarkColor])
     secondaryColor = [secondaryColor gtm_colorByAdjustingLuminance:-0.2];
 
   NSDictionary* secondaryTextAttributes =
       [NSDictionary dictionaryWithObjectsAndKeys:
           secondaryColor, NSForegroundColorAttributeName,
           [self secondaryFont], NSFontAttributeName,
           nil];
   NSPoint secondaryPos =
       NSMakePoint(innerFrame.origin.x + kTextPosLeft, kSecondaryTextPosTop);
-
-  gfx::ScopedNSGraphicsContextSaveGState contextSave;
   NSGraphicsContext* nsContext = [NSGraphicsContext currentContext];
   CGContextRef cgContext = (CGContextRef)[nsContext graphicsPort];
+  [nsContext saveGraphicsState];
   [nsContext setCompositingOperation:NSCompositeSourceOver];
   CGContextSetAlpha(cgContext, statusAlpha_);
   [secondaryText drawAtPoint:secondaryPos
               withAttributes:secondaryTextAttributes];
+  [nsContext restoreGraphicsState];
 }
 
 - (void)drawWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {
   NSRect drawFrame = NSInsetRect(cellFrame, 1.5, 1.5);
   NSRect innerFrame = NSInsetRect(cellFrame, 2, 2);
 
   const float radius = 5;
   NSWindow* window = [controlView window];
   BOOL active = [window isKeyWindow] || [window isMainWindow];
 
@@ skipping 145 matching lines @@
                            cy - kDropdownArrowHeight/3 + kDropdownAreaY);
   NSPoint p2 = NSMakePoint(cx + kDropdownArrowWidth/2,
                            cy - kDropdownArrowHeight/3 + kDropdownAreaY);
   NSPoint p3 = NSMakePoint(cx, cy + kDropdownArrowHeight*2/3 + kDropdownAreaY);
   NSBezierPath *triangle = [NSBezierPath bezierPath];
   [triangle moveToPoint:p1];
   [triangle lineToPoint:p2];
   [triangle lineToPoint:p3];
   [triangle closePath];
 
-  gfx::ScopedNSGraphicsContextSaveGState scopedGState;
+  NSGraphicsContext* context = [NSGraphicsContext currentContext];
+  gfx::ScopedNSGraphicsContextSaveGState scopedGState(context);
 
   scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
   [shadow.get() setShadowColor:[NSColor whiteColor]];
   [shadow.get() setShadowOffset:NSMakeSize(0, -1)];
   [shadow setShadowBlurRadius:0.0];
   [shadow set];
 
   NSColor* fill = [self titleColorForPart:kDownloadItemMouseOverDropdownPart];
   [fill setFill];
 
@@ skipping 91 matching lines @@
   }
   return self;
 }
 
 - (void)setCurrentProgress:(NSAnimationProgress)progress {
   [super setCurrentProgress:progress];
   [cell_ animation:self progressed:progress];
 }
 
 @end