Merge 39084 - Correctly recognize emptiness of IDMap....

base/id_map_unittest.cc

 // Copyright (c) 2009 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/id_map.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
@@ skipping 41 matching lines @@
   IDMap<TestObject> map;
 
   TestObject obj1;
   TestObject obj2;
   TestObject obj3;
 
   map.Add(&obj1);
   map.Add(&obj2);
   map.Add(&obj3);
 
-  for (IDMap<TestObject>::const_iterator iter(&map);
-       !iter.IsAtEnd(); iter.Advance()) {
-    map.Remove(iter.GetCurrentKey());
+  {
+    IDMap<TestObject>::const_iterator iter(&map);
+    while (!iter.IsAtEnd()) {
+      map.Remove(iter.GetCurrentKey());
+      iter.Advance();
+    }
+
+    // Test that while an iterator is still in scope, we get the map emptiness
+    // right (http://crbug.com/35571).
+    EXPECT_TRUE(map.IsEmpty());
+    EXPECT_EQ(0U, map.size());
   }
+
+  EXPECT_TRUE(map.IsEmpty());
+  EXPECT_EQ(0U, map.size());
 }
 
 TEST_F(IDMapTest, IteratorRemainsValidWhenRemovingOtherElements) {
   IDMap<TestObject> map;
 
   const int kCount = 5;
   TestObject obj[kCount];
   int32 ids[kCount];
 
   for (int i = 0; i < kCount; i++)
@@ skipping 21 matching lines @@
       default:
         FAIL() << "should not have that many elements";
         break;
     }
 
     counter++;
   }
 }
 
 }  // namespace