Initializes SecurityPolicy static locals during blink initialization

Source/platform/weborigin/SecurityPolicy.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 31 matching lines @@
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 using OriginAccessWhiteList = Vector<OriginAccessEntry>;
 using OriginAccessMap = HashMap<String, OwnPtr<OriginAccessWhiteList>>;
 using OriginSet = HashSet<String>;
 
 static OriginAccessMap& originAccessMap()
 {
-    AtomicallyInitializedStaticReference(OriginAccessMap, originAccessMap, new OriginAccessMap);
+    DEFINE_STATIC_LOCAL(OriginAccessMap, originAccessMap, ());
     return originAccessMap;
 }
 
 static OriginSet& trustworthyOriginSet()
 {
-    AtomicallyInitializedStaticReference(OriginSet, trustworthyOriginSet, new OriginSet);
+    DEFINE_STATIC_LOCAL(OriginSet, trustworthyOriginSet, ());
     return trustworthyOriginSet;
 }
 
+void SecurityPolicy::init()
+{
+    originAccessMap();
+    trustworthyOriginSet();
+}
+
 bool SecurityPolicy::shouldHideReferrer(const KURL& url, const String& referrer)
 {
     bool referrerIsSecureURL = protocolIs(referrer, "https");
     bool referrerIsWebURL = referrerIsSecureURL || protocolIs(referrer, "http");
 
     if (!referrerIsWebURL)
         return true;
 
     if (!referrerIsSecureURL)
         return false;
@@ skipping 125 matching lines @@
         map.remove(it);
 }
 
 void SecurityPolicy::resetOriginAccessWhitelists()
 {
     ASSERT(isMainThread());
     originAccessMap().clear();
 }
 
 } // namespace blink