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

chrome/browser/ui/webui/options2/password_manager_handler.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 "chrome/browser/ui/webui/options2/password_manager_handler.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 107 matching lines @@
     if (*pref_name == prefs::kPasswordManagerAllowShowPasswords) {
       UpdatePasswordLists(NULL);
     }
   }
 
   OptionsPageUIHandler::Observe(type, source, details);
 }
 
 void PasswordManagerHandler::UpdatePasswordLists(const ListValue* args) {
   // Reset the current lists.
-  password_list_.reset();
-  password_exception_list_.reset();
+  password_list_.clear();
+  password_exception_list_.clear();
 
   languages_ = Profile::FromWebUI(web_ui())->GetPrefs()->
       GetString(prefs::kAcceptLanguages);
   populater_.Populate();
   exception_populater_.Populate();
 }
 
 void PasswordManagerHandler::RemoveSavedPassword(const ListValue* args) {
   PasswordStore* store = GetPasswordStore();
   if (!store)
@@ skipping 97 matching lines @@
     LOG(ERROR) << "No password store! Cannot display passwords.";
   }
 }
 
 void PasswordManagerHandler::PasswordListPopulater::
     OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
         const std::vector<webkit::forms::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
-  page_->password_list_.reset();
+  page_->password_list_.clear();
   page_->password_list_.insert(page_->password_list_.end(),
                                result.begin(), result.end());
   page_->SetPasswordList();
 }
 
 PasswordManagerHandler::PasswordExceptionListPopulater::
     PasswordExceptionListPopulater(PasswordManagerHandler* page)
         : ListPopulater(page) {
 }
 
 void PasswordManagerHandler::PasswordExceptionListPopulater::Populate() {
   PasswordStore* store = page_->GetPasswordStore();
   if (store != NULL) {
     if (pending_login_query_)
       store->CancelRequest(pending_login_query_);
 
     pending_login_query_ = store->GetBlacklistLogins(this);
   } else {
     LOG(ERROR) << "No password store! Cannot display exceptions.";
   }
 }
 
 void PasswordManagerHandler::PasswordExceptionListPopulater::
     OnPasswordStoreRequestDone(
         CancelableRequestProvider::Handle handle,
         const std::vector<webkit::forms::PasswordForm*>& result) {
   DCHECK_EQ(pending_login_query_, handle);
   pending_login_query_ = 0;
-  page_->password_exception_list_.reset();
+  page_->password_exception_list_.clear();
   page_->password_exception_list_.insert(page_->password_exception_list_.end(),
                                          result.begin(), result.end());
   page_->SetPasswordExceptionList();
 }
 
 }  // namespace options2