Revert 49984 - patch from issue 2762014

base/scoped_nsobject.h

Index: base/scoped_nsobject.h
===================================================================
--- base/scoped_nsobject.h	(revision 49999)
+++ base/scoped_nsobject.h	(working copy)
@@ -48,9 +48,14 @@
     object_ = object;
   }
 
-  bool operator==(NST* that) const { return object_ == that; }
-  bool operator!=(NST* that) const { return object_ != that; }
+  bool operator==(NST* that) const {
+    return object_ == that;
+  }
 
+  bool operator!=(NST* that) const {
+    return object_ != that;
+  }
+
   operator NST*() const {
     return object_;
   }
@@ -80,23 +85,6 @@
   DISALLOW_COPY_AND_ASSIGN(scoped_nsobject);
 };
 
-// Free functions
-template <class C>
-void swap(scoped_nsobject<C>& p1, scoped_nsobject<C>& p2) {
-  p1.swap(p2);
-}
-
-template <class C>
-bool operator==(C* p1, const scoped_nsobject<C>& p2) {
-  return p1 == p2.get();
-}
-
-template <class C>
-bool operator!=(C* p1, const scoped_nsobject<C>& p2) {
-  return p1 != p2.get();
-}
-
-
 // Specialization to make scoped_nsobject<id> work.
 template<>
 class scoped_nsobject<id> {
@@ -121,9 +109,14 @@
     object_ = object;
   }
 
-  bool operator==(id that) const { return object_ == that; }
-  bool operator!=(id that) const { return object_ != that; }
+  bool operator==(id that) const {
+    return object_ == that;
+  }
 
+  bool operator!=(id that) const {
+    return object_ != that;
+  }
+
   operator id() const {
     return object_;
   }