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

net/base/network_config_watcher_mac.h

 // 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.
 
 #ifndef NET_BASE_NETWORK_CONFIG_WATCHER_MAC_H_
 #define NET_BASE_NETWORK_CONFIG_WATCHER_MAC_H_
 
 #include <SystemConfiguration/SCDynamicStore.h>
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
-#include "base/scoped_cftyperef.h"
+#include "base/mac/scoped_cftyperef.h"
 #include "base/scoped_ptr.h"
 
 namespace base {
 class Thread;
 }
 
 namespace net {
 
 // Base class for watching the Mac OS system network settings.
 class NetworkConfigWatcherMac : public MessageLoop::DestructionObserver {
@@ skipping 25 matching lines @@
   // implementation.  The SystemConfiguration calls in this function can lead to
   // contention early on, so we invoke this function later on in startup to keep
   // it fast.
   void Init();
 
   // The thread used to listen for notifications.  This relays the notification
   // to the registered observers without posting back to the thread the object
   // was created on.
   scoped_ptr<base::Thread> notifier_thread_;
 
-  scoped_cftyperef<CFRunLoopSourceRef> run_loop_source_;
+  base::mac::ScopedCFTypeRef<CFRunLoopSourceRef> run_loop_source_;
 
   Delegate* const delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkConfigWatcherMac);
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_NETWORK_CONFIG_WATCHER_MAC_H_