mac: Update clients of scoped_nsobject.h.

ui/base/resource/resource_bundle_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/base/resource/resource_bundle.h"
 
 #import <AppKit/AppKit.h>
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/memory/ref_counted_memory.h"
-#include "base/memory/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "ui/base/resource/resource_handle.h"
 #include "ui/gfx/image/image.h"
 
 namespace ui {
 
 namespace {
 
 base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
@@ skipping 86 matching lines @@
       }
       return images_[resource_id];
     }
   }
 
   gfx::Image image;
   if (delegate_)
     image = delegate_->GetNativeImageNamed(resource_id, rtl);
 
   if (image.IsEmpty()) {
-    scoped_nsobject<NSImage> ns_image;
+    base::scoped_nsobject<NSImage> ns_image;
     for (size_t i = 0; i < data_packs_.size(); ++i) {
       scoped_refptr<base::RefCountedStaticMemory> data(
           data_packs_[i]->GetStaticMemory(resource_id));
       if (!data.get())
         continue;
 
-      scoped_nsobject<NSData> ns_data(
-          [[NSData alloc] initWithBytes:data->front()
-                                 length:data->size()]);
+      base::scoped_nsobject<NSData> ns_data(
+          [[NSData alloc] initWithBytes:data->front() length:data->size()]);
       if (!ns_image.get()) {
         ns_image.reset([[NSImage alloc] initWithData:ns_data]);
       } else {
         NSImageRep* image_rep = [NSBitmapImageRep imageRepWithData:ns_data];
         if (image_rep)
           [ns_image addRepresentation:image_rep];
       }
     }
 
     if (!ns_image.get()) {
       LOG(WARNING) << "Unable to load image with id " << resource_id;
       NOTREACHED();  // Want to assert in debug mode.
       return GetEmptyImage();
     }
 
     image = gfx::Image(ns_image.release());
   }
 
   base::AutoLock lock(*images_and_fonts_lock_);
 
   // Another thread raced the load and has already cached the image.
   if (images_.count(resource_id))
     return images_[resource_id];
 
   images_[resource_id] = image;
   return images_[resource_id];
 }
 
 }  // namespace ui