Fix ScopedPtrMap with custom Compare.

base/containers/scoped_ptr_map.h

 // Copyright 2015 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_CONTAINERS_SCOPED_PTR_MAP_H_
 #define BASE_CONTAINERS_SCOPED_PTR_MAP_H_
 
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 24 matching lines @@
   using reference = typename Container::reference;
   using const_reference = typename Container::const_reference;
   using key_type = typename Container::key_type;
   using mapped_type = ScopedPtr;
   using key_compare = typename Container::key_compare;
   using const_iterator = typename Container::const_iterator;
   using const_reverse_iterator = typename Container::const_reverse_iterator;
 
   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;
   }
 
   const_iterator find(const Key& k) const { return data_.find(k); }
   size_type count(const Key& k) const { return data_.count(k); }
 
   bool empty() const { return data_.empty(); }
   size_t size() const { return data_.size(); }
 
   const_reverse_iterator rbegin() const { return data_.rbegin(); }
   const_reverse_iterator rend() const { return data_.rend(); }
 
   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_); }
 
   // Inserts |val| into the map, associated with |key|.
   std::pair<const_iterator, bool> insert(const Key& key, ScopedPtr val) {
     auto result = data_.insert(std::make_pair(key, val.get()));
     if (result.second)
       ignore_result(val.release());
     return result;
   }
@@ skipping 60 matching lines @@
     // in C++03 (get the key and do the lookup again).
     if (it == data_.end())
       return data_.end();
     return data_.find(it->first);
   };
 };
 
 }  // namespace base
 
 #endif  // BASE_CONTAINERS_SCOPED_PTR_MAP_H_