Refactor KeySystems code to call a function to populate the info.

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 <string>
 #include <vector>
 
@@ skipping 27 matching lines @@
 class TargetPolicy;
 }
 
 namespace content {
 
 class ContentBrowserClient;
 class ContentClient;
 class ContentPluginClient;
 class ContentRendererClient;
 class ContentUtilityClient;
+struct KeySystemInfo;
 struct PepperPluginInfo;
 
 // Setter and getter for the client.  The client should be set early, before any
 // content code is called.
 CONTENT_EXPORT void SetContentClient(ContentClient* client);
 
 #if defined(CONTENT_IMPLEMENTATION)
 // Content's embedder API should only be used by content.
 ContentClient* GetContentClient();
 #endif
@@ skipping 28 matching lines @@
   ContentRendererClient* renderer() { return renderer_; }
   ContentUtilityClient* utility() { return utility_; }
 
   // Sets the currently active URL.  Use GURL() to clear the URL.
   virtual void SetActiveURL(const GURL& url) {}
 
   // Sets the data on the current gpu.
   virtual void SetGpuInfo(const gpu::GPUInfo& gpu_info) {}
 
   // Gives the embedder a chance to register its own pepper plugins.
-  virtual void AddPepperPlugins(
-      std::vector<content::PepperPluginInfo>* plugins) {}
+  virtual void AddPepperPlugins(std::vector<PepperPluginInfo>* plugins) {}
 
   // Gives the embedder a chance to register its own standard and saveable
   // url schemes early on in the startup sequence.
   virtual void AddAdditionalSchemes(
       std::vector<std::string>* standard_schemes,
       std::vector<std::string>* savable_schemes) {}
 
+  // Gives the embedder a chance to register the key system(s) it supports.
+  virtual void AddKeySystems(std::vector<KeySystemInfo>* key_systems) {}

[jam, 2013/09/03 20:50:52]

why is this in ContentClient? it should only be here if it's needed in multiple
child process types (i.e. content/renderer and content/utility or
content/public).

if you only need this in the renderer, then it should be in
ContentRendererClient

[ddorwin, 2013/09/04 00:41:55]

Done.

+
   // Returns whether the given message should be sent in a swapped out renderer.
   virtual bool CanSendWhileSwappedOut(const IPC::Message* message);
 
   // Returns whether the given message should be processed in the browser on
   // behalf of a swapped out renderer.
   virtual bool CanHandleWhileSwappedOut(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.
@@ skipping 48 matching lines @@
   ContentPluginClient* plugin_;
   // 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_