Fix ScopedPtrMap with custom Compare.

base/containers/scoped_ptr_map_unittest.cc

 // 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.
 
 #include "base/containers/scoped_ptr_map.h"
 
 #include <functional>
 #include <map>
 #include <utility>
 
@@ skipping 129 matching lines @@
   ScopedPtrMap<int, scoped_ptr<ScopedDestroyer>> scoped_map;
   scoped_map.insert(0, make_scoped_ptr(new ScopedDestroyer(&destroyed)));
   EXPECT_FALSE(destroyed);
   scoped_map.clear();
   EXPECT_TRUE(destroyed);
   EXPECT_TRUE(scoped_map.empty());
 }
 
 TEST(ScopedPtrMapTest, Compare) {
   // Construct a ScopedPtrMap with a custom comparison function.
-  bool destroyed = false;
-  ScopedPtrMap<int, scoped_ptr<ScopedDestroyer>, std::greater<int>> scoped_map;
-  scoped_map.insert(0, make_scoped_ptr(new ScopedDestroyer(&destroyed)));
-  scoped_map.insert(1, make_scoped_ptr(new ScopedDestroyer(&destroyed)));
+  ScopedPtrMap<int, scoped_ptr<int>, std::greater<int>> scoped_map1;
+  scoped_map1.insert(0, make_scoped_ptr(new int(0)));
+  scoped_map1.insert(1, make_scoped_ptr(new int(0)));
 
-  auto it = scoped_map.begin();
+  auto it = scoped_map1.begin();
   EXPECT_EQ(1, it->first);
   ++it;
   EXPECT_EQ(0, it->first);
+
+  // Test the move constructor.
+  ScopedPtrMap<int, scoped_ptr<int>, std::greater<int>> scoped_map2(
+      scoped_map1.Pass());
+  EXPECT_EQ(2u, scoped_map2.size());
+  EXPECT_TRUE(scoped_map1.empty());
+
+  // Test move assignment.
+  scoped_map1 = scoped_map2.Pass();
+  EXPECT_EQ(2u, scoped_map1.size());
+  EXPECT_TRUE(scoped_map2.empty());
+
+  // Test swap.
+  scoped_map2.swap(scoped_map1);
+  EXPECT_EQ(2u, scoped_map2.size());
+  EXPECT_TRUE(scoped_map1.empty());
 }
 
 TEST(ScopedPtrMapTest, Scope) {
   bool destroyed = false;
   {
     ScopedPtrMap<int, scoped_ptr<ScopedDestroyer>> scoped_map;
     scoped_map.insert(0, make_scoped_ptr(new ScopedDestroyer(&destroyed)));
     EXPECT_FALSE(destroyed);
   }
   EXPECT_TRUE(destroyed);
@@ skipping 62 matching lines @@
   EXPECT_TRUE(scoped_map.empty());
   EXPECT_EQ(elem, result.find(0)->second);
   EXPECT_FALSE(destroyed);
 
   result.clear();
   EXPECT_TRUE(destroyed);
 };
 
 }  // namespace
 }  // namespace base