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

chromecast/common/cast_content_client.cc

 // Copyright 2014 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 "chromecast/common/cast_content_client.h"
 
 #include <stdint.h>
 
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
@@ skipping 38 matching lines @@
   std::string os_info;
   base::StringAppendF(
       &os_info,
       "Android %s%s",
       android_version_str.c_str(),
       android_info_str.c_str());
   return os_info;
 }
 #endif
 
-const url::SchemeWithType kChromeResourceSchemeWithType = {
-  kChromeResourceScheme, url::SCHEME_WITHOUT_PORT
-};
-
 }  // namespace
 
 std::string GetUserAgent() {
   std::string product = "Chrome/" PRODUCT_VERSION;
   std::string os_info;
   base::StringAppendF(
       &os_info,
       "%s%s",
 #if defined(OS_ANDROID)
       "Linux; ",
       BuildAndroidOsInfo().c_str()
 #else
       "X11; ",
       content::BuildOSCpuInfo().c_str()
 #endif
       );
   return content::BuildUserAgentFromOSAndProduct(os_info, product) +
       " CrKey/" CAST_BUILD_REVISION;
 }
 
 CastContentClient::~CastContentClient() {
 }
 
-void CastContentClient::AddAdditionalSchemes(
-    std::vector<url::SchemeWithType>* standard_schemes,
-    std::vector<url::SchemeWithType>* referrer_schemes,
-    std::vector<std::string>* savable_schemes) {
-  standard_schemes->push_back(kChromeResourceSchemeWithType);
+void CastContentClient::AddAdditionalSchemes(Schemes* schemes) {
+  schemes->standard_schemes.push_back(kChromeResourceScheme);
 }
 
 std::string CastContentClient::GetUserAgent() const {
   return chromecast::shell::GetUserAgent();
 }
 
 base::string16 CastContentClient::GetLocalizedString(int message_id) const {
   return l10n_util::GetStringUTF16(message_id);
 }
 
@@ skipping 16 matching lines @@
 }
 
 #if defined(OS_ANDROID)
 ::media::MediaClientAndroid* CastContentClient::GetMediaClientAndroid() {
   return new media::CastMediaClientAndroid();
 }
 #endif  // OS_ANDROID
 
 }  // namespace shell
 }  // namespace chromecast