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

net/base/network_config_watcher_mac.cc

 // Copyright (c) 2010 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 "net/base/network_config_watcher_mac.h"
 
 #include <SystemConfiguration/SCDynamicStoreKey.h>
 #include <SystemConfiguration/SCSchemaDefinitions.h>
 #include <algorithm>
 
 #include "base/thread.h"
+#include "base/mac/scoped_cftyperef.h"
 
 // We only post tasks to a child thread we own, so we don't need refcounting.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(net::NetworkConfigWatcherMac);
 
 namespace net {
 
 namespace {
 
 // Called back by OS.  Calls OnNetworkConfigChange().
 void DynamicStoreCallback(SCDynamicStoreRef /* store */,
@@ skipping 47 matching lines @@
   DCHECK_EQ(notifier_thread_->message_loop(), MessageLoop::current());
 
   // Add a run loop source for a dynamic store to the current run loop.
   SCDynamicStoreContext context = {
     0,          // Version 0.
     delegate_,  // User data.
     NULL,       // This is not reference counted.  No retain function.
     NULL,       // This is not reference counted.  No release function.
     NULL,       // No description for this.
   };
-  scoped_cftyperef<SCDynamicStoreRef> store(SCDynamicStoreCreate(
+  base::mac::ScopedCFTypeRef<SCDynamicStoreRef> store(SCDynamicStoreCreate(
       NULL, CFSTR("org.chromium"), DynamicStoreCallback, &context));
   run_loop_source_.reset(SCDynamicStoreCreateRunLoopSource(
       NULL, store.get(), 0));
   CFRunLoopAddSource(CFRunLoopGetCurrent(), run_loop_source_.get(),
                      kCFRunLoopCommonModes);
 
   // Set up notifications for interface and IP address changes.
   delegate_->SetDynamicStoreNotificationKeys(store.get());
 
   MessageLoop::current()->AddDestructionObserver(this);
 }
 
 }  // namespace net