Create an interface for KeySystems, migrate WebEncryptedMediaClientImpl.

media/blink/webencryptedmediaclient_impl.h

 // 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.
 
 #ifndef MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_
 #define MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_
 
 #include <string>
 
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/media_export.h"
 #include "third_party/WebKit/public/platform/WebContentDecryptionModuleResult.h"
 #include "third_party/WebKit/public/platform/WebEncryptedMediaClient.h"
 #include "third_party/WebKit/public/web/WebSecurityOrigin.h"
 
 namespace media {
 
+class KeySystems;
 class MediaPermission;
 
 class MEDIA_EXPORT WebEncryptedMediaClientImpl
     : public blink::WebEncryptedMediaClient {
  public:
-  WebEncryptedMediaClientImpl(scoped_ptr<CdmFactory> cdm_factory,
+  WebEncryptedMediaClientImpl(const KeySystems& key_systems,
+                              scoped_ptr<CdmFactory> cdm_factory,
                               MediaPermission* media_permission);
   virtual ~WebEncryptedMediaClientImpl();
 
   // WebEncryptedMediaClient implementation.
   virtual void requestMediaKeySystemAccess(
       blink::WebEncryptedMediaRequest request);
 
   // Create the CDM for |key_system| and |security_origin|. The caller owns
   // the created cdm (passed back using |result|).
   void CreateCdm(const blink::WebString& key_system,
                  bool allow_distinctive_identifier,
                  bool allow_persistent_state,
                  const blink::WebSecurityOrigin& security_origin,
                  blink::WebContentDecryptionModuleResult result);
 
  private:
   // Pick a supported configuration if possible, and complete the request. This
   // method may asynchronously invoke itself after prompting for permissions.
   void SelectSupportedConfiguration(blink::WebEncryptedMediaRequest request,

[ddorwin, 2015/03/20 00:55:03]

Most of the logic in this class and in the .cc file is related to processing the
configuration. We should probably move it to its own class (and file?). That
would also avoid having to include details related to key_systems.h in
render_frame_impl.cc and html_document.cc.

The only reason we inject is for testing - otherwise we could have a member
internally. But if we're not going to test from the public functions, we may not
need to do this.

Pulling out all that logic into a separate .cc file is probably better
organization too.

[sandersd (OOO until July 31), 2015/03/20 22:53:20]

Acknowledged.

                                     bool was_permission_requested,
                                     bool is_permission_granted);
 
   // Report usage of key system to UMA. There are 2 different counts logged:
   // 1. The key system is requested.
   // 2. The requested key system and options are supported.
   // Each stat is only reported once per renderer frame per key system.
   class Reporter;
 
   // Gets the Reporter for |key_system|. If it doesn't already exist,
   // create one.
   Reporter* GetReporter(const std::string& key_system);
 
   // Key system <-> Reporter map.
   typedef base::ScopedPtrHashMap<std::string, Reporter> Reporters;
   Reporters reporters_;
 
+  const KeySystems& key_systems_;
   scoped_ptr<CdmFactory> cdm_factory_;
   MediaPermission* media_permission_;
 
   base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_