mac: Update clients of scoped_nsobject.h.

chrome/browser/storage_monitor/image_capture_device_manager_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.
 
 
 #import <Foundation/Foundation.h>
 #import <ImageCaptureCore/ImageCaptureCore.h>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 27 matching lines @@
 
 }  // namespace
 
 // Private ICCameraDevice method needed to properly initialize the object.
 @interface NSObject (PrivateAPIICCameraDevice)
 - (id)initWithDictionary:(id)properties;
 @end
 
 @interface MockICCameraDevice : ICCameraDevice {
  @private
-  scoped_nsobject<NSMutableArray> allMediaFiles_;
+  base::scoped_nsobject<NSMutableArray> allMediaFiles_;
 }
 
 - (void)addMediaFile:(ICCameraFile*)file;
 
 @end
 
 @implementation MockICCameraDevice
 
 - (id)init {
   if ((self = [super initWithDictionary:[NSDictionary dictionary]])) {
@@ skipping 63 matching lines @@
    didDownloadFile:file
              error:nil
            options:returnOptions
        contextInfo:contextInfo];
 }
 
 @end
 
 @interface MockICCameraFolder : ICCameraFolder {
  @private
-  scoped_nsobject<NSString> name_;
+  base::scoped_nsobject<NSString> name_;
 }
 
 - (id)initWithName:(NSString*)name;
 
 @end
 
 @implementation MockICCameraFolder
 
 - (id)initWithName:(NSString*)name {
   if ((self = [super init])) {
     name_.reset([name retain]);
   }
   return self;
 }
 
 - (NSString*)name {
   return name_;
 }
 
 - (ICCameraFolder*)parentFolder {
   return nil;
 }
 
 @end
 
 @interface MockICCameraFile : ICCameraFile {
  @private
-  scoped_nsobject<NSString> name_;
-  scoped_nsobject<NSDate> date_;
-  scoped_nsobject<MockICCameraFolder> parent_;
+  base::scoped_nsobject<NSString> name_;
+  base::scoped_nsobject<NSDate> date_;
+  base::scoped_nsobject<MockICCameraFolder> parent_;
 }
 
 - (id)init:(NSString*)name;
 - (void)setParent:(NSString*)parent;
 
 @end
 
 @implementation MockICCameraFile
 
 - (id)init:(NSString*)name {
@@ skipping 82 matching lines @@
 class ImageCaptureDeviceManagerTest : public testing::Test {
  public:
   virtual void SetUp() OVERRIDE {
     ui_thread_.reset(new content::TestBrowserThread(
         content::BrowserThread::UI, &message_loop_));
   }
 
   MockICCameraDevice* AttachDevice(
       chrome::ImageCaptureDeviceManager* manager) {
     // Ownership will be passed to the device browser delegate.
-    scoped_nsobject<MockICCameraDevice> device(
+    base::scoped_nsobject<MockICCameraDevice> device(
         [[MockICCameraDevice alloc] init]);
     id<ICDeviceBrowserDelegate> delegate = manager->device_browser();
     [delegate deviceBrowser:nil didAddDevice:device moreComing:NO];
     return device.autorelease();
   }
 
   void DetachDevice(chrome::ImageCaptureDeviceManager* manager,
                     ICCameraDevice* device) {
     id<ICDeviceBrowserDelegate> delegate = manager->device_browser();
     [delegate deviceBrowser:nil didRemoveDevice:device moreGoing:NO];
@@ skipping 22 matching lines @@
 };
 
 TEST_F(ImageCaptureDeviceManagerTest, OpenCamera) {
   chrome::ImageCaptureDeviceManager manager;
   manager.SetNotifications(monitor_.receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
   EXPECT_FALSE(chrome::ImageCaptureDeviceManager::deviceForUUID(
       "nonexistent"));
 
-  scoped_nsobject<ImageCaptureDevice> camera(
-      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId)
-          retain]);
+  base::scoped_nsobject<ImageCaptureDevice> camera(
+      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
-  scoped_nsobject<MockICCameraFile> picture1(
+  base::scoped_nsobject<MockICCameraFile> picture1(
       [[MockICCameraFile alloc] init:@"pic1"]);
   [camera cameraDevice:nil didAddItem:picture1];
-  scoped_nsobject<MockICCameraFile> picture2(
+  base::scoped_nsobject<MockICCameraFile> picture2(
       [[MockICCameraFile alloc] init:@"pic2"]);
   [camera cameraDevice:nil didAddItem:picture2];
   ASSERT_EQ(2U, listener_.items().size());
   EXPECT_EQ("pic1", listener_.items()[0]);
   EXPECT_EQ("pic2", listener_.items()[1]);
   EXPECT_FALSE(listener_.completed());
 
   [camera deviceDidBecomeReadyWithCompleteContentCatalog:nil];
 
   ASSERT_EQ(2U, listener_.items().size());
   EXPECT_TRUE(listener_.completed());
 
   [camera close];
   DetachDevice(&manager, device);
   EXPECT_FALSE(chrome::ImageCaptureDeviceManager::deviceForUUID(
       kDeviceId));
 }
 
 TEST_F(ImageCaptureDeviceManagerTest, RemoveCamera) {
   chrome::ImageCaptureDeviceManager manager;
   manager.SetNotifications(monitor_.receiver());
   ICCameraDevice* device = AttachDevice(&manager);
 
-  scoped_nsobject<ImageCaptureDevice> camera(
-      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId)
-          retain]);
+  base::scoped_nsobject<ImageCaptureDevice> camera(
+      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   [camera didRemoveDevice:device];
   EXPECT_TRUE(listener_.removed());
 }
 
 TEST_F(ImageCaptureDeviceManagerTest, DownloadFile) {
   scoped_ptr<content::TestBrowserThread> file_thread(
       new content::TestBrowserThread(
           content::BrowserThread::FILE, &message_loop_));
 
   chrome::ImageCaptureDeviceManager manager;
   manager.SetNotifications(monitor_.receiver());
   MockICCameraDevice* device = AttachDevice(&manager);
 
-  scoped_nsobject<ImageCaptureDevice> camera(
-      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId)
-          retain]);
+  base::scoped_nsobject<ImageCaptureDevice> camera(
+      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   std::string kTestFileName("pic1");
 
-  scoped_nsobject<MockICCameraFile> picture1(
-      [[MockICCameraFile alloc]
-          init:base::SysUTF8ToNSString(kTestFileName)]);
+  base::scoped_nsobject<MockICCameraFile> picture1(
+      [[MockICCameraFile alloc] init:base::SysUTF8ToNSString(kTestFileName)]);
   [device addMediaFile:picture1];
   [camera cameraDevice:nil didAddItem:picture1];
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
 
   EXPECT_EQ(0U, listener_.downloads().size());
 
   // Test that a nonexistent file we ask to be downloaded will
   // return us a not-found error.
@@ skipping 26 matching lines @@
 
 TEST_F(ImageCaptureDeviceManagerTest, TestSubdirectories) {
   scoped_ptr<content::TestBrowserThread> file_thread(
       new content::TestBrowserThread(
           content::BrowserThread::FILE, &message_loop_));
 
   chrome::ImageCaptureDeviceManager manager;
   manager.SetNotifications(monitor_.receiver());
   MockICCameraDevice* device = AttachDevice(&manager);
 
-  scoped_nsobject<ImageCaptureDevice> camera(
-      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId)
-          retain]);
+  base::scoped_nsobject<ImageCaptureDevice> camera(
+      [chrome::ImageCaptureDeviceManager::deviceForUUID(kDeviceId) retain]);
 
   [camera setListener:listener_.AsWeakPtr()];
   [camera open];
 
   std::string kTestFileName("pic1");
-  scoped_nsobject<MockICCameraFile> picture1(
-      [[MockICCameraFile alloc]
-          init:base::SysUTF8ToNSString(kTestFileName)]);
+  base::scoped_nsobject<MockICCameraFile> picture1(
+      [[MockICCameraFile alloc] init:base::SysUTF8ToNSString(kTestFileName)]);
   [picture1 setParent:base::SysUTF8ToNSString("dir")];
   [device addMediaFile:picture1];
   [camera cameraDevice:nil didAddItem:picture1];
 
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath temp_file = temp_dir.path().Append("tempfile");
 
   [camera downloadFile:("dir/" + kTestFileName) localPath:temp_file];
   message_loop_.RunUntilIdle();
 
   char file_contents[5];
   ASSERT_EQ(4, file_util::ReadFile(temp_file, file_contents,
                                    strlen(kTestFileContents)));
   EXPECT_EQ(kTestFileContents,
             std::string(file_contents, strlen(kTestFileContents)));
 
   [camera didRemoveDevice:device];
 }