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

content/common/url_schemes.h

Index: content/common/url_schemes.h
diff --git a/content/common/url_schemes.h b/content/common/url_schemes.h
index 1441c9c9ab0cc7c4c4274697681b693ae4e75964..5cce307e9ea72100cfc2e50e3ed9eecdbfe71535 100644
--- a/content/common/url_schemes.h
+++ b/content/common/url_schemes.h
@@ -5,7 +5,11 @@
 #ifndef CONTENT_COMMON_URL_SCHEMES_H_
 #define CONTENT_COMMON_URL_SCHEMES_H_
 
+#include <string>
+#include <vector>
+
 #include "content/common/content_export.h"
+#include "url/gurl.h"
 
 namespace content {
 
@@ -21,6 +25,17 @@ namespace content {
 // overriding the ContentClient::AddAdditionalSchemes method.
 CONTENT_EXPORT void RegisterContentSchemes(bool lock_schemes);
 
+// See comment in ContentClient::AddAdditionalSchemes for explanations. These
+// getters can be invoked on any thread.

[brettw, 2017/01/10 18:58:17]

Can you comment here when the return values will be null? If you don't think
that's an interesting case, then they should probably return const refs instead.

[jam, 2017/01/10 19:16:33]

changed to const ref

+const std::vector<std::string>* GetSavableSchemesInternal();
+const std::vector<std::string>* GetSecureSchemes();
+const std::vector<GURL>* GetSecureOrigins();
+const std::vector<std::string>* GetServiceWorkerSchemes();
+
+// Resets the internal secure schemes/origins and service worker whitelists.
+// Used only for testing.
+void CONTENT_EXPORT RefreshSecuritySchemesForTesting();
+
 }  // namespace content
 
 #endif  // CONTENT_COMMON_URL_SCHEMES_H_