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

base/scoped_nsobject.h

 // 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.
 
 #ifndef BASE_SCOPED_NSOBJECT_H_
 #define BASE_SCOPED_NSOBJECT_H_
 #pragma once
 
 #import <Foundation/Foundation.h>
 #include "base/basictypes.h"
@@ skipping 23 matching lines @@
   explicit scoped_nsobject(NST* object = nil)
       : object_(object) {
   }
 
   ~scoped_nsobject() {
     [object_ release];
   }
 
   void reset(NST* object = nil) {
     // We intentionally do not check that object != object_ as the caller must
-    // already have an ownership claim over whatever it gives to scoped_nsobject
-    // and scoped_cftyperef, whether it's in the constructor or in a call to
-    // reset().  In either case, it relinquishes that claim and the scoper
-    // assumes it.
+    // already have an ownership claim over whatever it gives to
+    // scoped_nsobject and ScopedCFTypeRef, whether it's in the constructor or
+    // in a call to reset().  In either case, it relinquishes that claim and
+    // the scoper assumes it.
     [object_ release];
     object_ = object;
   }
 
   bool operator==(NST* that) const { return object_ == that; }
   bool operator!=(NST* that) const { return object_ != that; }
 
   operator NST*() const {
     return object_;
   }
@@ skipping 49 matching lines @@
   explicit scoped_nsobject(id object = nil)
       : object_(object) {
   }
 
   ~scoped_nsobject() {
     [object_ release];
   }
 
   void reset(id object = nil) {
     // We intentionally do not check that object != object_ as the caller must
-    // already have an ownership claim over whatever it gives to scoped_nsobject
-    // and scoped_cftyperef, whether it's in the constructor or in a call to
-    // reset().  In either case, it relinquishes that claim and the scoper
-    // assumes it.
+    // already have an ownership claim over whatever it gives to
+    // scoped_nsobject and ScopedCFTypeRef, whether it's in the constructor or
+    // in a call to reset().  In either case, it relinquishes that claim and
+    // the scoper assumes it.
     [object_ release];
     object_ = object;
   }
 
   bool operator==(id that) const { return object_ == that; }
   bool operator!=(id that) const { return object_ != that; }
 
   operator id() const {
     return object_;
   }
@@ skipping 27 matching lines @@
 // ScopedNSAutoreleasePool instead. This is a compile time check. See details
 // at top of header.
 template<>
 class scoped_nsobject<NSAutoreleasePool> {
  private:
   explicit scoped_nsobject(NSAutoreleasePool* object = nil);
   DISALLOW_COPY_AND_ASSIGN(scoped_nsobject);
 };
 
 #endif  // BASE_SCOPED_NSOBJECT_H_