Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(883)

Unified Diff: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc

Issue 8491043: Allow linker initialization of lazy instance (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix CrOS 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index 8510a028694239ca187f86cd8348bedefe5dee7f..0f477539481f0c57ce68bc505a33ef6f2afbcb55 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
@@ -83,7 +83,7 @@ class ChromeURLContentSecurityPolicyExceptionSet
};
base::LazyInstance<ChromeURLContentSecurityPolicyExceptionSet>
- g_chrome_url_content_security_policy_exceptions(base::LINKER_INITIALIZED);
+ g_chrome_url_content_security_policy_exceptions = LINKER_ZERO_INITIALIZED;
// Parse a URL into the components used to resolve its request. |source_name|
// is the hostname and |path| is the remaining portion of the URL.

Powered by Google App Engine
This is Rietveld 408576698