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

chrome/browser/net/sqlite_server_bound_cert_store_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/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 118 matching lines @@
   ASSERT_STREQ("d", ec_cert->cert().c_str());
   ASSERT_EQ(3, ec_cert->creation_time().ToInternalValue());
   ASSERT_EQ(4, ec_cert->expiration_time().ToInternalValue());
 
   // Now delete the cert and check persistence again.
   store_->DeleteServerBoundCert(*certs[0]);
   store_->DeleteServerBoundCert(*certs[1]);
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   ASSERT_TRUE(helper->Run());
-  certs.reset();
+  certs.clear();
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().Append(chrome::kOBCertFilename), NULL);
 
   // Reload and check if the cert has been removed.
   ASSERT_TRUE(store_->Load(&certs.get()));
   ASSERT_EQ(0U, certs.size());
 }
 
 TEST_F(SQLiteServerBoundCertStoreTest, TestUpgradeV1) {
   // Reset the store.  We'll be using a different database for this test.
@@ skipping 412 matching lines @@
   // We've put a exit policy in place, but force the state to be saved.
   store_->SetForceKeepSessionState();
   store_ = NULL;
   ASSERT_TRUE(helper->Run());
 
   // Reload the store and check that the certs are still there.
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().AppendASCII("ClearOnExitDB"), clear_policy.get());
 
   // Reload and test for persistence
-  certs.reset();
+  certs.clear();
   ASSERT_TRUE(store_->Load(&certs.get()));
   ASSERT_EQ(3U, certs.size());
 
   // Delete the store. This time, the exit policy should be in place.
   store_ = NULL;
   // Make sure we wait until the destructor has run.
   ASSERT_TRUE(helper->Run());
 
   store_ = new SQLiteServerBoundCertStore(
       temp_dir_.path().AppendASCII("ClearOnExitDB"), clear_policy.get());
 
   // Reload and test for persistence
-  certs.reset();
+  certs.clear();
   ASSERT_TRUE(store_->Load(&certs.get()));
   ASSERT_EQ(2U, certs.size());
 
   ASSERT_TRUE(CertificateExistsInList(&certs.get(),
                                       "other.com",
                                       net::CLIENT_CERT_RSA_SIGN,
                                       "a", "b", 1, 2));
   ASSERT_TRUE(CertificateExistsInList(&certs.get(),
                                       "protected.com",
                                       net::CLIENT_CERT_RSA_SIGN,
                                       "n", "m", 5, 6));
 }