diff options
13 files changed, 3 insertions, 17 deletions
diff --git a/base/prefs/pref_value_map.cc b/base/prefs/pref_value_map.cc index 7d3dbe7..cafc1d8 100644 --- a/base/prefs/pref_value_map.cc +++ b/base/prefs/pref_value_map.cc @@ -67,7 +67,6 @@ bool PrefValueMap::RemoveValue(const std::string& key) { void PrefValueMap::Clear() { STLDeleteValues(&prefs_); - prefs_.clear(); } void PrefValueMap::Swap(PrefValueMap* other) { diff --git a/chrome/browser/chromeos/settings/cros_settings_unittest.cc b/chrome/browser/chromeos/settings/cros_settings_unittest.cc index 936041d..f56b33a 100644 --- a/chrome/browser/chromeos/settings/cros_settings_unittest.cc +++ b/chrome/browser/chromeos/settings/cros_settings_unittest.cc @@ -37,10 +37,9 @@ class CrosSettingsTest : public testing::Test { virtual ~CrosSettingsTest() {} - virtual void TearDown() override { + void TearDown() override { ASSERT_TRUE(expected_props_.empty()); STLDeleteValues(&expected_props_); - expected_props_.clear(); } void FetchPref(const std::string& pref) { diff --git a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc index 0c09805..0060fc0 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_browsertest.cc @@ -94,7 +94,6 @@ class DownloadsEventsListener : public content::NotificationObserver { void ClearEvents() { STLDeleteElements(&events_); - events_.clear(); } class Event { diff --git a/chrome/browser/extensions/extension_special_storage_policy.cc b/chrome/browser/extensions/extension_special_storage_policy.cc index f07999f..06c5dc2 100644 --- a/chrome/browser/extensions/extension_special_storage_policy.cc +++ b/chrome/browser/extensions/extension_special_storage_policy.cc @@ -361,5 +361,4 @@ void ExtensionSpecialStoragePolicy::SpecialCollection::Clear() { void ExtensionSpecialStoragePolicy::SpecialCollection::ClearCache() { STLDeleteValues(&cached_results_); - cached_results_.clear(); } diff --git a/chrome/browser/plugins/plugin_finder.cc b/chrome/browser/plugins/plugin_finder.cc index 31f6db5..5521c01 100644 --- a/chrome/browser/plugins/plugin_finder.cc +++ b/chrome/browser/plugins/plugin_finder.cc @@ -241,7 +241,6 @@ void PluginFinder::ReinitializePlugins( version_ = version; STLDeleteValues(&identifier_plugin_); - identifier_plugin_.clear(); for (base::DictionaryValue::Iterator plugin_it(*plugin_list); !plugin_it.IsAtEnd(); plugin_it.Advance()) { diff --git a/chrome/browser/ui/search_engines/template_url_table_model.cc b/chrome/browser/ui/search_engines/template_url_table_model.cc index ca1c33d..b4201e6 100644 --- a/chrome/browser/ui/search_engines/template_url_table_model.cc +++ b/chrome/browser/ui/search_engines/template_url_table_model.cc @@ -128,12 +128,10 @@ TemplateURLTableModel::TemplateURLTableModel( TemplateURLTableModel::~TemplateURLTableModel() { template_url_service_->RemoveObserver(this); STLDeleteElements(&entries_); - entries_.clear(); } void TemplateURLTableModel::Reload() { STLDeleteElements(&entries_); - entries_.clear(); TemplateURLService::TemplateURLVector urls = template_url_service_->GetTemplateURLs(); diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc index 8186c82..84dc2f5 100644 --- a/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc +++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_event_store.cc @@ -155,7 +155,6 @@ DataReductionProxyEventStore::DataReductionProxyEventStore( DataReductionProxyEventStore::~DataReductionProxyEventStore() { STLDeleteElements(&stored_events_); - stored_events_.clear(); } void DataReductionProxyEventStore::AddProxyEnabledEvent( diff --git a/components/invalidation/sync_system_resources.cc b/components/invalidation/sync_system_resources.cc index 04c5c77..05f1aee 100644 --- a/components/invalidation/sync_system_resources.cc +++ b/components/invalidation/sync_system_resources.cc @@ -90,7 +90,6 @@ void SyncInvalidationScheduler::Stop() { is_started_ = false; weak_factory_.InvalidateWeakPtrs(); STLDeleteElements(&posted_tasks_); - posted_tasks_.clear(); } void SyncInvalidationScheduler::Schedule(invalidation::TimeDelta delay, diff --git a/content/browser/download/download_item_impl_unittest.cc b/content/browser/download/download_item_impl_unittest.cc index acbc55e..786d903 100644 --- a/content/browser/download/download_item_impl_unittest.cc +++ b/content/browser/download/download_item_impl_unittest.cc @@ -53,7 +53,7 @@ class MockDelegate : public DownloadItemImplDelegate { MOCK_METHOD1(ShouldOpenFileBasedOnExtension, bool(const base::FilePath&)); MOCK_METHOD1(CheckForFileRemoval, void(DownloadItemImpl*)); - virtual void ResumeInterruptedDownload( + void ResumeInterruptedDownload( scoped_ptr<DownloadUrlParameters> params, uint32 id) override { MockResumeInterruptedDownload(params.get(), id); } @@ -207,7 +207,6 @@ class DownloadItemTest : public testing::Test { virtual void TearDown() { ui_thread_.DeprecatedGetThreadObject()->message_loop()->RunUntilIdle(); STLDeleteElements(&allocated_downloads_); - allocated_downloads_.clear(); } // This class keeps ownership of the created download item; it will diff --git a/content/browser/download/download_manager_impl.cc b/content/browser/download/download_manager_impl.cc index 5c8f339..70a51fa 100644 --- a/content/browser/download/download_manager_impl.cc +++ b/content/browser/download/download_manager_impl.cc @@ -345,7 +345,6 @@ void DownloadManagerImpl::Shutdown() { download->Cancel(false); } STLDeleteValues(&downloads_); - downloads_.clear(); // We'll have nothing more to report to the observers after this point. observers_.Clear(); diff --git a/extensions/browser/extension_pref_value_map.cc b/extensions/browser/extension_pref_value_map.cc index 0797b24..d21a969 100644 --- a/extensions/browser/extension_pref_value_map.cc +++ b/extensions/browser/extension_pref_value_map.cc @@ -39,7 +39,6 @@ ExtensionPrefValueMap::~ExtensionPrefValueMap() { destroyed_ = true; } STLDeleteValues(&entries_); - entries_.clear(); } void ExtensionPrefValueMap::Shutdown() { diff --git a/net/quic/quic_session.cc b/net/quic/quic_session.cc index 20fd983..f747169 100644 --- a/net/quic/quic_session.cc +++ b/net/quic/quic_session.cc @@ -748,7 +748,6 @@ bool QuicSession::GetSSLInfo(SSLInfo* ssl_info) const { void QuicSession::PostProcessAfterData() { STLDeleteElements(&closed_streams_); - closed_streams_.clear(); if (connection()->connected() && locally_closed_streams_highest_offset_.size() > max_open_streams_) { diff --git a/net/spdy/spdy_read_queue.cc b/net/spdy/spdy_read_queue.cc index 36f1e06..627bf5b 100644 --- a/net/spdy/spdy_read_queue.cc +++ b/net/spdy/spdy_read_queue.cc @@ -53,7 +53,6 @@ size_t SpdyReadQueue::Dequeue(char* out, size_t len) { void SpdyReadQueue::Clear() { STLDeleteElements(&queue_); - queue_.clear(); } -} // namespace +} // namespace net |