mac: Update clients of scoped_nsobject.h.

chrome/browser/media_galleries/mac/mtp_device_delegate_impl_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.
 
 #import <Foundation/Foundation.h>
 #import <ImageCaptureCore/ImageCaptureCore.h>
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/mac/cocoa_protocols.h"
 #include "base/mac/foundation_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/test/sequenced_worker_pool_owner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/media_galleries/mac/mtp_device_delegate_impl_mac.h"
 #include "chrome/browser/storage_monitor/image_capture_device_manager.h"
 #include "chrome/browser/storage_monitor/test_storage_monitor.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 17 matching lines @@
 namespace {
 
 const char kDeviceId[] = "id";
 const char kDevicePath[] = "/ic:id";
 const char kTestFileContents[] = "test";
 
 }  // namespace
 
 @interface MockMTPICCameraDevice : ICCameraDevice {
  @private
-  scoped_nsobject<NSMutableArray> allMediaFiles_;
+  base::scoped_nsobject<NSMutableArray> allMediaFiles_;
 }
 
 - (void)addMediaFile:(ICCameraFile*)file;
 
 @end
 
 @implementation MockMTPICCameraDevice
 
 - (NSString*)mountPoint {
   return @"mountPoint";
@@ skipping 53 matching lines @@
    didDownloadFile:file
              error:nil
            options:returnOptions
        contextInfo:contextInfo];
 }
 
 @end
 
 @interface MockMTPICCameraFile : ICCameraFile {
  @private
-  scoped_nsobject<NSString> name_;
-  scoped_nsobject<NSDate> date_;
+  base::scoped_nsobject<NSString> name_;
+  base::scoped_nsobject<NSDate> date_;
 }
 
 - (id)init:(NSString*)name;
 
 @end
 
 @implementation MockMTPICCameraFile
 
 - (id)init:(NSString*)name {
   if ((self = [super init])) {
@@ skipping 403 matching lines @@
   ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   base::Time t1 = base::Time::Now();
   base::PlatformFileInfo info;
   info.size = 4;
   info.is_directory = false;
   info.is_symbolic_link = false;
   info.last_modified = t1;
   info.last_accessed = t1;
   info.creation_time = t1;
   std::string kTestFileName("filename");
-  scoped_nsobject<MockMTPICCameraFile> picture1(
+  base::scoped_nsobject<MockMTPICCameraFile> picture1(
       [[MockMTPICCameraFile alloc]
           init:base::SysUTF8ToNSString(kTestFileName)]);
   [camera_ addMediaFile:picture1];
   delegate_->ItemAdded(kTestFileName, info);
   delegate_->NoMoreItems();
 
   EXPECT_EQ(base::PLATFORM_FILE_OK, ReadDir(base::FilePath(kDevicePath)));
   ASSERT_EQ(1U, file_list_.size());
   ASSERT_EQ("filename", file_list_[0].name);
 
   EXPECT_EQ(base::PLATFORM_FILE_ERROR_NOT_FOUND,
             DownloadFile(base::FilePath("/ic:id/nonexist"),
                          temp_dir_.path().Append("target")));
 
   EXPECT_EQ(base::PLATFORM_FILE_OK,
              DownloadFile(base::FilePath("/ic:id/filename"),
                           temp_dir_.path().Append("target")));
   std::string contents;
   EXPECT_TRUE(file_util::ReadFileToString(temp_dir_.path().Append("target"),
                                           &contents));
   EXPECT_EQ(kTestFileContents, contents);
 }