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

chromeos/dbus/ibus/ibus_property_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 "chromeos/dbus/ibus/ibus_property.h"
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 20 matching lines @@
 // This function clears IBusProperty::sub_properties_ and does not add any
 // entries into it. The testing data can be checked with CheckProperty function
 // with same |prefix|.
 void SetProperty(const std::string& prefix, IBusProperty* property) {
   property->set_key(prefix + kSampleKey);
   property->set_type(kSampleType);
   property->set_label(prefix + kSampleLabel);
   property->set_tooltip(prefix + kSampleTooltip);
   property->set_visible(kSampleVisible);
   property->set_checked(kSampleChecked);
-  property->mutable_sub_properties()->reset();
+  property->mutable_sub_properties()->clear();
 }
 
 // Checks testing data in |property| with |prefix|.
 // This function does not check IBusProperty::sub_properties_.
 bool CheckProperty(const std::string& prefix, const IBusProperty& property) {
   if ((prefix + kSampleKey) != property.key()) {
     LOG(ERROR) << "Does not match IBusProperty::key value: " << std::endl
                << "Expected: " << (prefix + kSampleKey) << std::endl
                << "Actual: " << property.key();
     return false;
@@ skipping 61 matching lines @@
   const IBusPropertyList& sub_properties = target_property.sub_properties();
   ASSERT_EQ(kSubPropertyCount, sub_properties.size());
   for (size_t i = 0; i < kSubPropertyCount; ++i) {
     const std::string prefix = "Sub" + base::Uint64ToString(i);
     EXPECT_TRUE(CheckProperty(prefix, *(sub_properties[i])));
   }
 }
 
 }  // namespace ibus
 }  // namespace chromeos