base: Make ScopedVector::clear() destroy elements.

base/memory/scoped_vector_unittest.cc

 // Copyright (c) 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.
 
 #include "base/memory/scoped_vector.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 89 matching lines @@
 
 TEST(ScopedVectorTest, LifeCycleWatcher) {
   LifeCycleWatcher watcher;
   EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
   LifeCycleObject* object = watcher.NewLifeCycleObject();
   EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
   delete object;
   EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
 }
 
-TEST(ScopedVectorTest, Reset) {
+TEST(ScopedVectorTest, Clear) {
   LifeCycleWatcher watcher;
   EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
   ScopedVector<LifeCycleObject> scoped_vector;
   scoped_vector.push_back(watcher.NewLifeCycleObject());
   EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
-  scoped_vector.reset();
+  scoped_vector.clear();
   EXPECT_EQ(LC_DESTROYED, watcher.life_cycle_state());
+  EXPECT_EQ(static_cast<size_t>(0), scoped_vector.size());
+}
+
+TEST(ScopedVectorTest, WeakClear) {
+  LifeCycleWatcher watcher;
+  EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
+  ScopedVector<LifeCycleObject> scoped_vector;
+  scoped_ptr<LifeCycleObject> object(watcher.NewLifeCycleObject());
+  scoped_vector.push_back(object.get());
+  EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
+  scoped_vector.weak_clear();
+  EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
+  EXPECT_EQ(static_cast<size_t>(0), scoped_vector.size());
 }
 
 TEST(ScopedVectorTest, Scope) {
   LifeCycleWatcher watcher;
   EXPECT_EQ(LC_INITIAL, watcher.life_cycle_state());
   {
     ScopedVector<LifeCycleObject> scoped_vector;
     scoped_vector.push_back(watcher.NewLifeCycleObject());
     EXPECT_EQ(LC_CONSTRUCTED, watcher.life_cycle_state());
   }
@@ skipping 61 matching lines @@
 TEST(ScopedVectorTest, Passed) {
   int deletes = 0;
   ScopedVector<DeleteCounter> deleter_vector;
   deleter_vector.push_back(new DeleteCounter(&deletes));
   EXPECT_EQ(0, deletes);
   base::Callback<ScopedVector<DeleteCounter>(void)> callback =
       base::Bind(&PassThru<DeleteCounter>, base::Passed(&deleter_vector));
   EXPECT_EQ(0, deletes);
   ScopedVector<DeleteCounter> result = callback.Run();
   EXPECT_EQ(0, deletes);
-  result.reset();
+  result.clear();
   EXPECT_EQ(1, deletes);
 };
 
 TEST(ScopedVectorTest, InsertRange) {
   LifeCycleWatcher watchers[5];
 
   std::vector<LifeCycleObject*> vec;
   for(LifeCycleWatcher* it = watchers; it != watchers + arraysize(watchers);
       ++it) {
     EXPECT_EQ(LC_INITIAL, it->life_cycle_state());
@@ skipping 11 matching lines @@
   for(LifeCycleWatcher* it = watchers; it != watchers + 1; ++it)
     EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
   for(LifeCycleWatcher* it = watchers + 1; it != watchers + 3; ++it)
     EXPECT_EQ(LC_DESTROYED, it->life_cycle_state());
   for(LifeCycleWatcher* it = watchers + 3; it != watchers + arraysize(watchers);
       ++it)
     EXPECT_EQ(LC_CONSTRUCTED, it->life_cycle_state());
 }
 
 }  // namespace