Cleanup of static lists of schemes & origins that are created at startup.

chrome/common/secure_origin_whitelist.h

Index: chrome/common/secure_origin_whitelist.h
diff --git a/chrome/common/secure_origin_whitelist.h b/chrome/common/secure_origin_whitelist.h
index 02e1f2438b384fef8ae91f59f621513e241146d7..db0cd23447d5512954449a52e470722e18291dac 100644
--- a/chrome/common/secure_origin_whitelist.h
+++ b/chrome/common/secure_origin_whitelist.h
@@ -6,19 +6,19 @@
 #define CHROME_COMMON_SECURE_ORIGIN_WHITELIST_H_
 
 #include <set>
+#include <string>
+#include <vector>
 
 #include "url/gurl.h"
 
-// |origins| is a return value parameter that gets a whitelist of origins that
-// need to be considered trustworthy.  The whitelist is given by
-// kUnsafelyTreatInsecureOriginAsSecure command-line option.
-// See https://www.w3.org/TR/powerful-features/#is-origin-trustworthy.
-void GetSecureOriginWhitelist(std::set<GURL>* origins);
+// Return a whitelist of origins that need to be considered trustworthy.
+// The whitelist is given by kUnsafelyTreatInsecureOriginAsSecure
+// command-line option. See
+// https://www.w3.org/TR/powerful-features/#is-origin-trustworthy.
+std::vector<GURL> GetSecureOriginWhitelist();
 
-// |schemes| is a return value parameter that gets a whitelist of schemes that
-// should bypass the Is Privileged Context check.
-// See http://www.w3.org/TR/powerful-features/#settings-privileged
-void GetSchemesBypassingSecureContextCheckWhitelist(
-    std::set<std::string>* schemes);
+// Returns a whitelist of schemes that should bypass the Is Privileged Context
+// check. See http://www.w3.org/TR/powerful-features/#settings-privileged.
+std::set<std::string> GetSchemesBypassingSecureContextCheckWhitelist();
 
 #endif  // CHROME_COMMON_SECURE_ORIGIN_WHITELIST_H_