mac: Update clients of scoped_nsobject.h.

chrome/browser/ui/cocoa/dock_icon.mm

 // Copyright (c) 2012 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/dock_icon.h"
 
 #include "base/logging.h"
 #include "base/mac/bundle_locations.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // The fraction of the size of the dock icon that the badge is.
 const float kBadgeFraction = 0.4f;
 
@@ skipping 58 matching lines @@
   NSPoint badgeCenter = NSMakePoint(NSMidX(badgeRect), NSMidY(badgeRect));
 
   // Background
   NSColor* backgroundColor = [NSColor colorWithCalibratedRed:0.85
                                                        green:0.85
                                                         blue:0.85
                                                        alpha:1.0];
   NSColor* backgroundHighlight =
       [backgroundColor blendedColorWithFraction:0.85
                                         ofColor:[NSColor whiteColor]];
-  scoped_nsobject<NSGradient> backgroundGradient(
+  base::scoped_nsobject<NSGradient> backgroundGradient(
       [[NSGradient alloc] initWithStartingColor:backgroundHighlight
                                     endingColor:backgroundColor]);
   NSBezierPath* badgeEdge = [NSBezierPath bezierPathWithOvalInRect:badgeRect];
   {
     gfx::ScopedNSGraphicsContextSaveGState scopedGState;
     [badgeEdge addClip];
     [backgroundGradient drawFromCenter:badgeCenter
                                 radius:0.0
                               toCenter:badgeCenter
                                 radius:badgeRadius
                                options:0];
   }
 
   // Slice
   if (!indeterminate_) {
     NSColor* sliceColor = [NSColor colorWithCalibratedRed:0.45
                                                     green:0.8
                                                      blue:0.25
                                                     alpha:1.0];
     NSColor* sliceHighlight =
         [sliceColor blendedColorWithFraction:0.4
                                      ofColor:[NSColor whiteColor]];
-    scoped_nsobject<NSGradient> sliceGradient(
+    base::scoped_nsobject<NSGradient> sliceGradient(
         [[NSGradient alloc] initWithStartingColor:sliceHighlight
                                       endingColor:sliceColor]);
     NSBezierPath* progressSlice;
     if (progress_ >= 1.0) {
       progressSlice = [NSBezierPath bezierPathWithOvalInRect:badgeRect];
     } else {
       CGFloat endAngle = 90.0 - 360.0 * progress_;
       if (endAngle < 0.0)
         endAngle += 360.0;
       progressSlice = [NSBezierPath bezierPath];
@@ skipping 11 matching lines @@
                            radius:0.0
                          toCenter:badgeCenter
                            radius:badgeRadius
                           options:0];
   }
 
   // Edge
   {
     gfx::ScopedNSGraphicsContextSaveGState scopedGState;
     [[NSColor whiteColor] set];
-    scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
+    base::scoped_nsobject<NSShadow> shadow([[NSShadow alloc] init]);
     [shadow.get() setShadowOffset:NSMakeSize(0, -2)];
     [shadow setShadowBlurRadius:2];
     [shadow set];
     [badgeEdge setLineWidth:2];
     [badgeEdge stroke];
   }
 
   // Download count
-  scoped_nsobject<NSNumberFormatter> formatter(
+  base::scoped_nsobject<NSNumberFormatter> formatter(
       [[NSNumberFormatter alloc] init]);
   NSString* countString =
       [formatter stringFromNumber:[NSNumber numberWithInt:downloads_]];
 
-  scoped_nsobject<NSShadow> countShadow([[NSShadow alloc] init]);
+  base::scoped_nsobject<NSShadow> countShadow([[NSShadow alloc] init]);
   [countShadow setShadowBlurRadius:3.0];
   [countShadow.get() setShadowColor:[NSColor whiteColor]];
   [countShadow.get() setShadowOffset:NSMakeSize(0.0, 0.0)];
   NSMutableDictionary* countAttrsDict =
       [NSMutableDictionary dictionaryWithObjectsAndKeys:
           [NSColor blackColor], NSForegroundColorAttributeName,
           countShadow.get(), NSShadowAttributeName,
           nil];
   CGFloat countFontSize = badgeRadius;
   NSSize countSize = NSZeroSize;
-  scoped_nsobject<NSAttributedString> countAttrString;
+  base::scoped_nsobject<NSAttributedString> countAttrString;
   while (1) {
     NSFont* countFont = [NSFont fontWithName:@"Helvetica-Bold"
                                         size:countFontSize];
 
     // This will generally be plain Helvetica.
     if (!countFont)
       countFont = [NSFont userFontOfSize:countFontSize];
 
     // Continued failure would generate an NSException.
     if (!countFont)
@@ skipping 21 matching lines @@
 @end
 
 
 @implementation DockIcon
 
 + (DockIcon*)sharedDockIcon {
   static DockIcon* icon;
   if (!icon) {
     NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile];
 
-    scoped_nsobject<DockTileView> dockTileView([[DockTileView alloc] init]);
+    base::scoped_nsobject<DockTileView> dockTileView(
+        [[DockTileView alloc] init]);
     [dockTile setContentView:dockTileView];
 
     icon = [[DockIcon alloc] init];
   }
 
   return icon;
 }
 
 - (void)updateIcon {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 37 matching lines @@
 
 - (void)setProgress:(float)progress {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   NSDockTile* dockTile = [[NSApplication sharedApplication] dockTile];
   DockTileView* dockTileView = (DockTileView*)([dockTile contentView]);
 
   [dockTileView setProgress:progress];
 }
 
 @end