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

content/public/common/content_client.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_piece.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
 #include "ui/base/layout.h"
+#include "url/gurl.h"
 #include "url/url_util.h"
 
-class GURL;
-
 namespace base {
 class RefCountedMemory;
 }
 
 namespace IPC {
 class Message;
 }
 
 namespace gfx {
 class Image;
@@ skipping 55 matching lines @@
 
   // Gives the embedder a chance to register its own pepper plugins.
   virtual void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) {}
 
   // Gives the embedder a chance to register the content decryption
   // modules it supports.
   virtual void AddContentDecryptionModules(
       std::vector<content::CdmInfo>* cdms) {}
 
-  // Gives the embedder a chance to register its own standard, referrer and
-  // saveable url schemes early on in the startup sequence.
-  virtual void AddAdditionalSchemes(
-      std::vector<url::SchemeWithType>* standard_schemes,
-      std::vector<url::SchemeWithType>* referrer_schemes,
-      std::vector<std::string>* savable_schemes) {}
+  // Gives the embedder a chance to register its own schemes early in the
+  // startup sequence.
+  // For the secure schemes and origins that need to be considered trustworthy,
+  // see https://www.w3.org/TR/powerful-features/#is-origin-trustworthy.
+  // |service_workers_schemes| are additional schemes that should be allowed to
+  // register service workers. Only secure and trustworthy schemes should be
+  // added.
+  struct Schemes {
+    Schemes();
+    ~Schemes();
+    std::vector<std::string> standard_schemes;
+    std::vector<std::string> referrer_schemes;
+    std::vector<std::string> savable_schemes;
+    std::vector<std::string> secure_schemes;
+    std::vector<std::string> service_worker_schemes;
+    std::vector<GURL> secure_origins;
+  };
+
+  virtual void AddAdditionalSchemes(Schemes* schemes) {}
 
   // Returns whether the given message should be sent in a swapped out renderer.
   virtual bool CanSendWhileSwappedOut(const IPC::Message* message);
 
   // Returns a string describing the embedder product name and version,
   // of the form "productname/version", with no other slashes.
   // Used as part of the user agent string.
   virtual std::string GetProduct() const;
 
   // Returns the user agent.  Content may cache this value.
@@ skipping 24 matching lines @@
   // for |sandbox_type| are defined by the embedder and should start with
   // SandboxType::SANDBOX_TYPE_AFTER_LAST_TYPE. Returns false if no sandbox
   // profile for the given |sandbox_type| exists. Otherwise,
   // |sandbox_profile_resource_id| is set to the resource ID corresponding to
   // the sandbox profile to use and true is returned.
   virtual bool GetSandboxProfileForSandboxType(
       int sandbox_type,
       int* sandbox_profile_resource_id) const;
 #endif
 
-  // Gives the embedder a chance to register additional schemes and origins
-  // that need to be considered trustworthy.
-  // See https://www.w3.org/TR/powerful-features/#is-origin-trustworthy.
-  virtual void AddSecureSchemesAndOrigins(std::set<std::string>* schemes,
-                                          std::set<GURL>* origins) {}
-
-  // Gives the embedder a chance to register additional schemes that
-  // should be allowed to register service workers. Only secure and
-  // trustworthy schemes should be added.
-  virtual void AddServiceWorkerSchemes(std::set<std::string>* schemes) {}
-
   // Returns whether or not V8 script extensions should be allowed for a
   // service worker.
   virtual bool AllowScriptExtensionForServiceWorker(const GURL& script_url);
 
   // Returns true if the embedder wishes to supplement the site isolation policy
   // used by the content layer. Returning true enables the infrastructure for
   // out-of-process iframes, and causes the content layer to consult
   // ContentBrowserClient::DoesSiteRequireDedicatedProcess() when making process
   // model decisions.
   virtual bool IsSupplementarySiteIsolationModeEnabled();
@@ skipping 22 matching lines @@
   ContentGpuClient* gpu_;
   // The embedder API for participating in renderer logic.
   ContentRendererClient* renderer_;
   // The embedder API for participating in utility logic.
   ContentUtilityClient* utility_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_