mac: Update clients of scoped_nsobject.h.

ui/gfx/image/image_skia_util_mac.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.
 
 #include "ui/gfx/image/image_skia_util_mac.h"
 
 #include <cmath>
 #include <limits>
 
 #import <AppKit/AppKit.h>
 
 #include "base/mac/mac_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #include "skia/ext/skia_utils_mac.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 // Returns NSImageRep whose pixel size most closely matches |desired_size|.
 NSImageRep* GetNSImageRepWithPixelSize(NSImage* image,
                                        NSSize desired_size) {
@@ skipping 58 matching lines @@
 gfx::ImageSkia ApplicationIconAtSize(int desired_size) {
   NSImage* image = [NSImage imageNamed:@"NSApplicationIcon"];
   return ImageSkiaFromResizedNSImage(image,
                                      NSMakeSize(desired_size, desired_size));
 }
 
 NSImage* NSImageFromImageSkia(const gfx::ImageSkia& image_skia) {
   if (image_skia.isNull())
     return nil;
 
-  scoped_nsobject<NSImage> image([[NSImage alloc] init]);
+  base::scoped_nsobject<NSImage> image([[NSImage alloc] init]);
   image_skia.EnsureRepsForSupportedScaleFactors();
   std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps();
   for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
        it != image_reps.end(); ++it) {
     [image addRepresentation:
         gfx::SkBitmapToNSBitmapImageRep(it->sk_bitmap())];
   }
 
   [image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
   return [image.release() autorelease];
 }
 
 NSImage* NSImageFromImageSkiaWithColorSpace(const gfx::ImageSkia& image_skia,
                                             CGColorSpaceRef color_space) {
   if (image_skia.isNull())
     return nil;
 
-  scoped_nsobject<NSImage> image([[NSImage alloc] init]);
+  base::scoped_nsobject<NSImage> image([[NSImage alloc] init]);
   image_skia.EnsureRepsForSupportedScaleFactors();
   std::vector<gfx::ImageSkiaRep> image_reps = image_skia.image_reps();
   for (std::vector<gfx::ImageSkiaRep>::const_iterator it = image_reps.begin();
        it != image_reps.end(); ++it) {
     [image addRepresentation:
         gfx::SkBitmapToNSBitmapImageRepWithColorSpace(it->sk_bitmap(),
                                                       color_space)];
   }
 
   [image setSize:NSMakeSize(image_skia.width(), image_skia.height())];
   return [image.release() autorelease];
 }
 
 }  // namespace gfx