Revert 165006 - Revert 165005 until skia_webkit.gyp is present everywhere.

base/memory/scoped_ptr.h

 // Copyright (c) 2012 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.
 
 // Scopers help you manage ownership of a pointer, helping you easily manage the
 // a pointer within a scope, and automatically destroying the pointer at the
 // end of a scope.  There are two main classes you will use, which correspond
 // to the operators new/delete and new[]/delete[].
 //
 // Example usage (scoped_ptr):
@@ skipping 226 matching lines @@
  private:
   C* ptr_;
 
   // Forbid comparison of scoped_ptr types.  If C2 != C, it totally doesn't
   // make sense, and if C2 == C, it still doesn't make sense because you should
   // never have the same object owned by two different scoped_ptrs.
   template <class C2> bool operator==(scoped_ptr<C2> const& p2) const;
   template <class C2> bool operator!=(scoped_ptr<C2> const& p2) const;
 
 };
-/*
-class SkRefCnt;
-template <>
-class scoped_ptr <SkRefCnt> {
-private:
-    scoped_ptr() { }
-    ~scoped_ptr() { };
-};
-*/
+
 // Free functions
 template <class C>
 void swap(scoped_ptr<C>& p1, scoped_ptr<C>& p2) {
   p1.swap(p2);
 }
 
 template <class C>
 bool operator==(C* p1, const scoped_ptr<C>& p2) {
   return p1 == p2.get();
 }
@@ skipping 257 matching lines @@
 
 // A function to convert T* into scoped_ptr<T>
 // Doing e.g. make_scoped_ptr(new FooBarBaz<type>(arg)) is a shorter notation
 // for scoped_ptr<FooBarBaz<type> >(new FooBarBaz<type>(arg))
 template <typename T>
 scoped_ptr<T> make_scoped_ptr(T* ptr) {
   return scoped_ptr<T>(ptr);
 }
 
 #endif  // BASE_MEMORY_SCOPED_PTR_H_