Re-land: cc: Cancel and re-prioritize worker pool tasks.

cc/base/scoped_ptr_hash_map.h

 // Copyright 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.
 
 #ifndef CC_BASE_SCOPED_PTR_HASH_MAP_H_
 #define CC_BASE_SCOPED_PTR_HASH_MAP_H_
 
 #include <algorithm>
 #include <utility>
 
@@ skipping 13 matching lines @@
   typedef base::hash_map<Key, Value*> Container;
 
  public:
   typedef typename Container::iterator iterator;
   typedef typename Container::const_iterator const_iterator;
 
   ScopedPtrHashMap() {}
 
   ~ScopedPtrHashMap() { clear(); }
 
-  void swap(ScopedPtrHashMap<Key, Value*>& other) {
+  void swap(ScopedPtrHashMap<Key, Value>& other) {
     data_.swap(other.data_);
   }
 
   std::pair<iterator, bool> insert(
       std::pair<Key, const scoped_ptr<Value> > pair) {
     return data_.insert(
         std::pair<Key, Value*>(pair.first, pair.second.release()));
   }
 
   // Replaces value but not key if key is already present.
@@ skipping 103 matching lines @@
 
  private:
   Container data_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedPtrHashMap);
 };
 
 }  // namespace cc
 
 #endif  // CC_BASE_SCOPED_PTR_HASH_MAP_H_