chrome/browser/content_settings/tab_specific_content_settings.cc - Issue 8573021: chrome: Remove 14 exit time destructors and 2 static initializers.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/content_settings/tab_specific_content_settings.cc

Issue 8573021: chrome: Remove 14 exit time destructors and 2 static initializers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Hopefully fix problems seen on the bots Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/content_settings/tab_specific_content_settings.cc

diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc

index 3009f250d66e9e016cda338b42b10ebaf2e40e31..da72352de30e57c99af2eb3418a3bfc297e5d2e4 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;

}