Simplify/Cleanup MediaClient

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 <memory>
 #include <string>
 #include <unordered_map>
 
 #include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "media/blink/key_system_config_selector.h"
 #include "media/blink/media_blink_export.h"
 #include "third_party/WebKit/public/platform/WebEncryptedMediaClient.h"
 
 namespace blink {
 
 class WebContentDecryptionModuleResult;
 struct WebMediaKeySystemConfiguration;
 class WebSecurityOrigin;
 
 }  // namespace blink
 
 namespace media {
 
 struct CdmConfig;
 class CdmFactory;
+class MediaLog;
 class MediaPermission;
 
 class MEDIA_BLINK_EXPORT WebEncryptedMediaClientImpl
     : public blink::WebEncryptedMediaClient {
  public:
   WebEncryptedMediaClientImpl(
       base::Callback<bool(void)> are_secure_codecs_supported_cb,
       CdmFactory* cdm_factory,
-      MediaPermission* media_permission);
+      MediaPermission* media_permission,
+      const scoped_refptr<MediaLog>& media_log);
   ~WebEncryptedMediaClientImpl() override;
 
   // WebEncryptedMediaClient implementation.
   void requestMediaKeySystemAccess(
       blink::WebEncryptedMediaRequest request) override;
 
   // 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,
@@ skipping 22 matching lines @@
   // Gets the Reporter for |key_system|. If it doesn't already exist,
   // create one.
   Reporter* GetReporter(const blink::WebString& key_system);
 
   // Reporter singletons.
   std::unordered_map<std::string, std::unique_ptr<Reporter>> reporters_;
 
   base::Callback<bool(void)> are_secure_codecs_supported_cb_;
   CdmFactory* cdm_factory_;
   KeySystemConfigSelector key_system_config_selector_;
+  scoped_refptr<MediaLog> media_log_;
   base::WeakPtrFactory<WebEncryptedMediaClientImpl> weak_factory_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BLINK_WEBENCRYPTEDMEDIACLIENT_IMPL_H_