Move scoped_cftyperef from base to base/mac, use the new namespace, and name ...

chrome/browser/file_path_watcher_mac.cc

 // Copyright (c) 2009 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/browser/file_path_watcher.h"
 
 #include <CoreServices/CoreServices.h>
 #include <set>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/singleton.h"
 #include "base/time.h"
 
 namespace {
 
 // The latency parameter passed to FSEventsStreamCreate().
 const CFAbsoluteTime kEventLatencySeconds = 0.3;
 
 // Mac-specific file watcher implementation based on the FSEvents API.
 class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
@@ skipping 156 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // It can happen that the watcher gets canceled while tasks that call this
   // function are still in flight, so abort if this situation is detected.
   if (canceled_)
     return;
 
   if (fsevent_stream_)
     DestroyEventStream();
 
-  scoped_cftyperef<CFStringRef> cf_path(CFStringCreateWithCString(
+  base::mac::ScopedCFTypeRef<CFStringRef> cf_path(CFStringCreateWithCString(
       NULL, target_.value().c_str(), kCFStringEncodingMacHFS));
-  scoped_cftyperef<CFStringRef> cf_dir_path(CFStringCreateWithCString(
+  base::mac::ScopedCFTypeRef<CFStringRef> cf_dir_path(CFStringCreateWithCString(
       NULL, target_.DirName().value().c_str(), kCFStringEncodingMacHFS));
   CFStringRef paths_array[] = { cf_path.get(), cf_dir_path.get() };
-  scoped_cftyperef<CFArrayRef> watched_paths(CFArrayCreate(
+  base::mac::ScopedCFTypeRef<CFArrayRef> watched_paths(CFArrayCreate(
       NULL, reinterpret_cast<const void**>(paths_array), arraysize(paths_array),
       &kCFTypeArrayCallBacks));
 
   FSEventStreamContext context;
   context.version = 0;
   context.info = this;
   context.retain = NULL;
   context.release = NULL;
   context.copyDescription = NULL;
 
@@ skipping 17 matching lines @@
   FSEventStreamInvalidate(fsevent_stream_);
   FSEventStreamRelease(fsevent_stream_);
   fsevent_stream_ = NULL;
 }
 
 }  // namespace
 
 FilePathWatcher::FilePathWatcher() {
   impl_ = new FilePathWatcherImpl();
 }