mac: Update clients of scoped_nsobject.h.

ui/gfx/image/image_ios.mm

 // Copyright 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.h"
 
+#import <UIKit/UIKit.h>
 #include <cmath>
 #include <limits>
-#import <UIKit/UIKit.h>
 
 #include "base/logging.h"
 #include "base/mac/scoped_cftyperef.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "ui/base/layout.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_ios.h"
 #include "ui/gfx/size.h"
 
 namespace gfx {
 namespace internal {
 
 namespace {
@@ skipping 86 matching lines @@
   UIImage* image = UIImageFromImageSkiaRep(image_skia_rep);
   return Get1xPNGBytesFromUIImage(image);
 }
 
 ImageSkia* ImageSkiaFromPNG(
     const std::vector<gfx::ImagePNGRep>& image_png_reps) {
   // iOS does not expose libpng, so conversion from PNG to ImageSkia must go
   // through UIImage.
   gfx::ImageSkia* image_skia = new gfx::ImageSkia();
   for (size_t i = 0; i < image_png_reps.size(); ++i) {
-    scoped_nsobject<UIImage> uiimage(CreateUIImageFromImagePNGRep(
-        image_png_reps[i]));
+    base::scoped_nsobject<UIImage> uiimage(
+        CreateUIImageFromImagePNGRep(image_png_reps[i]));
     gfx::ImageSkiaRep image_skia_rep = ImageSkiaRepOfScaleFactorFromUIImage(
         uiimage, image_png_reps[i].scale_factor);
     if (!image_skia_rep.is_null())
       image_skia->AddRepresentation(image_skia_rep);
   }
   return image_skia;
 }
 
 gfx::Size UIImageSize(UIImage* image) {
   int width = static_cast<int>(image.size.width);
   int height = static_cast<int>(image.size.height);
   return gfx::Size(width, height);
 }
 
 } // namespace internal
 } // namespace gfx