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

content/public/common/url_utils.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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() {
+const std::vector<std::string>* 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]))
+  const std::vector<std::string>* savable_schemes = GetSavableSchemesInternal();
+  for (auto& scheme : *savable_schemes) {
+    if (url.SchemeIs(scheme))
       return true;
   }
   return false;
 }
 
 }  // namespace content