Fix ScopedPtrMap with custom Compare.

base/containers/scoped_ptr_map.h

Index: base/containers/scoped_ptr_map.h
diff --git a/base/containers/scoped_ptr_map.h b/base/containers/scoped_ptr_map.h
index a4605e3b68877a2d8585552573d1603c75bdd7f6..622a39d121e8fa2b3f5eb8f91874229d6bf885d3 100644
--- a/base/containers/scoped_ptr_map.h
+++ b/base/containers/scoped_ptr_map.h
@@ -42,9 +42,9 @@ class ScopedPtrMap {
 
   ScopedPtrMap() {}
   ~ScopedPtrMap() { clear(); }
-  ScopedPtrMap(ScopedPtrMap<Key, ScopedPtr>&& other) { swap(other); }
+  ScopedPtrMap(ScopedPtrMap&& other) { swap(other); }
 
-  ScopedPtrMap& operator=(ScopedPtrMap<Key, ScopedPtr>&& rhs) {
+  ScopedPtrMap& operator=(ScopedPtrMap&& rhs) {
     swap(rhs);
     return *this;
   }
@@ -61,7 +61,7 @@ class ScopedPtrMap {
   const_iterator begin() const { return data_.begin(); }
   const_iterator end() const { return data_.end(); }
 
-  void swap(ScopedPtrMap<Key, ScopedPtr>& other) { data_.swap(other.data_); }
+  void swap(ScopedPtrMap& other) { data_.swap(other.data_); }
 
   void clear() { STLDeleteValues(&data_); }