Move KeySystemInfo to media.

content/public/renderer/content_renderer_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_RENDERER_CONTENT_RENDERER_CLIENT_H_
 #define CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 31 matching lines @@
 class WebRTCPeerConnectionHandlerClient;
 class WebSpeechSynthesizer;
 class WebSpeechSynthesizerClient;
 class WebThemeEngine;
 class WebURLRequest;
 class WebWorkerPermissionClientProxy;
 struct WebPluginParams;
 struct WebURLError;
 }
 
+namespace media {
+struct KeySystemInfo;
+}
+
 namespace content {
 class BrowserPluginDelegate;
 class DocumentState;
 class RenderFrame;
 class RenderView;
 class SynchronousCompositor;
-struct KeySystemInfo;
 struct WebPluginInfo;
 
 // Embedder API for participating in renderer logic.
 class CONTENT_EXPORT ContentRendererClient {
  public:
   virtual ~ContentRendererClient() {}
 
   // Notifies us that the RenderThread has been created.
   virtual void RenderThreadStarted() {}
 
@@ skipping 167 matching lines @@
 
   // Returns true if the given Pepper plugin is external (requiring special
   // startup steps).
   virtual bool IsExternalPepperPlugin(const std::string& module_name);
 
   // Returns true if the page at |url| can use Pepper MediaStream APIs.
   virtual bool AllowPepperMediaStreamAPI(const GURL& url);
 
   // Gives the embedder a chance to register the key system(s) it supports by
   // populating |key_systems|.
-  virtual void AddKeySystems(std::vector<KeySystemInfo>* key_systems);
+  virtual void AddKeySystems(std::vector<media::KeySystemInfo>* key_systems);

[xhwang, 2014/10/22 07:00:09]

jam: This is the tricky part of this CL. In ContentRendererClient, I am using an
struct in media. Is this allowed?

I am doing this because I need to move most part of
content/renderer/media/crypto/key_systems.* to media. So media code will also
need to access KeySystemInfo. An alternative is to keep both
content::KeySystemInfo and media::KeySystemInfo, then do the translation in
content/renderer/media code. But that seems unfortunate and will be hard to
maintain.

Please let me know what you think. Thanks!

[jam, 2014/10/23 20:12:22]

yep this is fine.

see other examples:
https://code.google.com/p/chromium/codesearch#search/&q=%22namespace%20media%...

 
   // Returns true if we should report a detailed message (including a stack
   // trace) for console [logs|errors|exceptions]. |source| is the WebKit-
   // reported source for the error; this can point to a page or a script,
   // and can be external or internal.
   virtual bool ShouldReportDetailedMessageForSource(
       const base::string16& source) const;
 
   // Returns true if we should apply the cross-site document blocking policy to
   // this renderer process. Currently, we apply the policy only to a renderer
@@ skipping 15 matching lines @@
   virtual bool IsPluginAllowedToUseDevChannelAPIs();
 
   // Returns a user agent override specific for |url|, or empty string if
   // default user agent should be used.
   virtual std::string GetUserAgentOverrideForURL(const GURL& url);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_CONTENT_RENDERER_CLIENT_H_