mac: Update clients of scoped_nsobject.h.

chrome/common/mac/cfbundle_blocker.mm

 // Copyright (c) 2011 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 "chrome/common/mac/cfbundle_blocker.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 #import <Foundation/Foundation.h>
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "third_party/mach_override/mach_override.h"
 
 extern "C" {
 
 // _CFBundleLoadExecutableAndReturnError is the internal implementation that
 // results in a dylib being loaded via dlopen. Both CFBundleLoadExecutable and
 // CFBundleLoadExecutableAndReturnError are funneled into this routine. Other
 // CFBundle functions may also call directly into here, perhaps due to
 // inlining their calls to CFBundleLoadExecutable.
@@ skipping 125 matching lines @@
     g_original_underscore_cfbundle_load_executable_and_return_error;
 
 Boolean ChromeCFBundleLoadExecutableAndReturnError(CFBundleRef bundle,
                                                    Boolean force_global,
                                                    CFErrorRef* error) {
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 
   DCHECK(g_original_underscore_cfbundle_load_executable_and_return_error);
 
   base::ScopedCFTypeRef<CFURLRef> url_cf(CFBundleCopyBundleURL(bundle));
-  scoped_nsobject<NSString> path(base::mac::CFToNSCast(
+  base::scoped_nsobject<NSString> path(base::mac::CFToNSCast(
       CFURLCopyFileSystemPath(url_cf, kCFURLPOSIXPathStyle)));
 
   NSString* bundle_id = base::mac::CFToNSCast(CFBundleGetIdentifier(bundle));
 
   NSDictionary* bundle_dictionary =
       base::mac::CFToNSCast(CFBundleGetInfoDictionary(bundle));
   NSString* version = [bundle_dictionary objectForKey:
       base::mac::CFToNSCast(kCFBundleVersionKey)];
   if (![version isKindOfClass:[NSString class]]) {
     // Deal with pranksters.
@@ skipping 152 matching lines @@
     }
   }
 
   // Nothing matched.
   return false;
 }
 
 }  // namespace mac
 }  // namespace common
 }  // namespace chrome