mac: Update clients of scoped_nsobject.h.

ui/gfx/image/image_mac_unittest.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 <Cocoa/Cocoa.h>
 
 #include "base/logging.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_png_rep.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/image/image_skia_util_mac.h"
 #include "ui/gfx/image/image_unittest_util.h"
 
 namespace {
 
 // Returns true if the structure of |ns_image| matches the structure
@@ skipping 73 matching lines @@
 TEST_F(ImageMacTest, MultiResolutionNSImageToImageSkia) {
   const int kWidth1x = 10;
   const int kHeight1x = 12;
   const int kWidth2x = 20;
   const int kHeight2x = 24;
 
   NSBitmapImageRep* ns_image_rep1;
   BitmapImageRep(kWidth1x, kHeight1x, &ns_image_rep1);
   NSBitmapImageRep* ns_image_rep2;
   BitmapImageRep(kWidth2x, kHeight2x, &ns_image_rep2);
-  scoped_nsobject<NSImage> ns_image(
+  base::scoped_nsobject<NSImage> ns_image(
       [[NSImage alloc] initWithSize:NSMakeSize(kWidth1x, kHeight1x)]);
   [ns_image addRepresentation:ns_image_rep1];
   [ns_image addRepresentation:ns_image_rep2];
 
   gfx::Image image(ns_image.release());
 
   EXPECT_EQ(1u, image.RepresentationCount());
 
   const gfx::ImageSkia* image_skia = image.ToImageSkia();
 
@@ skipping 11 matching lines @@
 // other than 1x and 2x results in an ImageSkia with scale factors 1x and
 // 2x;
 TEST_F(ImageMacTest, UnalignedMultiResolutionNSImageToImageSkia) {
   const int kWidth1x = 10;
   const int kHeight1x= 12;
   const int kWidth4x = 40;
   const int kHeight4x = 48;
 
   NSBitmapImageRep* ns_image_rep4;
   BitmapImageRep(kWidth4x, kHeight4x, &ns_image_rep4);
-  scoped_nsobject<NSImage> ns_image(
+  base::scoped_nsobject<NSImage> ns_image(
       [[NSImage alloc] initWithSize:NSMakeSize(kWidth1x, kHeight1x)]);
   [ns_image addRepresentation:ns_image_rep4];
 
   gfx::Image image(ns_image.release());
 
   EXPECT_EQ(1u, image.RepresentationCount());
 
   const gfx::ImageSkia* image_skia = image.ToImageSkia();
 
   std::vector<ui::ScaleFactor> scale_factors;
@@ skipping 59 matching lines @@
 
   // Convert to ImageSkia to check pixel contents of NSImageReps.
   gfx::ImageSkia image_skia = gfx::ImageSkiaFromNSImage(ns_image);
   EXPECT_TRUE(gt::IsEqual(bytes1x,
       image_skia.GetRepresentation(ui::SCALE_FACTOR_100P).sk_bitmap()));
   EXPECT_TRUE(gt::IsEqual(bytes2x,
       image_skia.GetRepresentation(ui::SCALE_FACTOR_200P).sk_bitmap()));
 }
 
 } // namespace