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

content/public/common/url_utils.cc

Index: content/public/common/url_utils.cc
diff --git a/content/public/common/url_utils.cc b/content/public/common/url_utils.cc
index 4133cb0154218575c62bd411e7c95b9bc70453b2..5ca69aa84a436a5ae3ecfd15e2ee14e864236c61 100644
--- a/content/public/common/url_utils.cc
+++ b/content/public/common/url_utils.cc
@@ -5,24 +5,19 @@
 #include "content/public/common/url_utils.h"
 
 #include "build/build_config.h"
-#include "content/common/savable_url_schemes.h"
+#include "content/common/url_schemes.h"
 #include "content/public/common/url_constants.h"
-#include "url/gurl.h"
 
 namespace content {
 
-const char* const* GetSavableSchemes() {
-  return GetSavableSchemesInternal();
-}
-
 bool HasWebUIScheme(const GURL& url) {
   return url.SchemeIs(kChromeDevToolsScheme) ||
          url.SchemeIs(kChromeUIScheme);
 }
 
 bool IsSavableURL(const GURL& url) {
-  for (int i = 0; GetSavableSchemes()[i] != NULL; ++i) {
-    if (url.SchemeIs(GetSavableSchemes()[i]))
+  for (auto& scheme : GetSavableSchemes()) {
+    if (url.SchemeIs(scheme))
       return true;
   }
   return false;