diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 18:37:40 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 18:37:40 +0000 |
| commit | 02c3f683b160a23afe889ab195ed2dc196a098fe (patch) | |
| tree | bbd8b0e40aa762682d756fbaa73b21045b07390a /chrome/browser/content_settings/tab_specific_content_settings.cc | |
| parent | 85d7bcf6ff662687704edd521f53b003c68ef9a2 (diff) | |
| download | chromium_src-02c3f683b160a23afe889ab195ed2dc196a098fe.zip chromium_src-02c3f683b160a23afe889ab195ed2dc196a098fe.tar.gz chromium_src-02c3f683b160a23afe889ab195ed2dc196a098fe.tar.bz2 | |
chrome: Remove 14 exit time destructors and 2 static initializers.
BUG=101600, 94925
TEST=none
TBR=mnissler
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=110235
Review URL: http://codereview.chromium.org/8573021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110330 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings/tab_specific_content_settings.cc')
| -rw-r--r-- | chrome/browser/content_settings/tab_specific_content_settings.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 3009f25..da72352 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -200,7 +200,7 @@ const std::set<std::string>& if (blocked_resources_[content_type].get()) { return *blocked_resources_[content_type]; } else { - static std::set<std::string> empty_set; + CR_DEFINE_STATIC_LOCAL(std::set<std::string>, empty_set, ()); return empty_set; } } |