Move webkit/renderer/media/android/ to content/renderer/media/android/.

webkit/renderer/media/crypto/proxy_decryptor.h

 // Copyright 2013 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 WEBKIT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 #define WEBKIT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
 #include "media/base/decryptor.h"
 #include "media/base/media_keys.h"
 
 namespace WebKit {
 class WebFrame;
 class WebMediaPlayerClient;
 }
 
 namespace webkit_media {
 
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-class WebMediaPlayerProxyAndroid;
-#endif
-
 // A decryptor proxy that creates a real decryptor object on demand and
 // forwards decryptor calls to it.
 // TODO(xhwang): Currently we don't support run-time switching among decryptor
 // objects. Fix this when needed.
 // TODO(xhwang): The ProxyDecryptor is not a Decryptor. Find a better name!
 class ProxyDecryptor : public media::MediaKeys {
  public:
   ProxyDecryptor(
 #if defined(ENABLE_PEPPER_CDMS)
       WebKit::WebMediaPlayerClient* web_media_player_client,
       WebKit::WebFrame* web_frame,
-#endif
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-      WebMediaPlayerProxyAndroid* proxy,
-      int media_keys_id,
+#elif defined(OS_ANDROID) && !defined(GOOGLE_TV)
+      scoped_ptr<media::MediaKeys> media_keys,
 #endif
       const media::KeyAddedCB& key_added_cb,
       const media::KeyErrorCB& key_error_cb,
       const media::KeyMessageCB& key_message_cb);
   virtual ~ProxyDecryptor();
 
   // Only call this once.
   bool InitializeCDM(const std::string& key_system);
 
   // Requests the ProxyDecryptor to notify the decryptor when it's ready through
@@ skipping 33 matching lines @@
                   const std::string& default_url);
 
   base::WeakPtrFactory<ProxyDecryptor> weak_ptr_factory_;
 
 #if defined(ENABLE_PEPPER_CDMS)
   // Needed to create the PpapiDecryptor.
   WebKit::WebMediaPlayerClient* web_media_player_client_;
   WebKit::WebFrame* web_frame_;
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
-#if defined(OS_ANDROID) && !defined(GOOGLE_TV)
-  // |proxy_| must outlive this object.
-  WebMediaPlayerProxyAndroid* proxy_;
-
-  int media_keys_id_;
-#endif  // defined(OS_ANDROID) && !defined(GOOGLE_TV)
+  // The real MediaKeys that manages key operations for the ProxyDecryptor.
+  // This pointer is protected by the |lock_|.
+  scoped_ptr<media::MediaKeys> media_keys_;
 
   // Callbacks for firing key events.
   media::KeyAddedCB key_added_cb_;
   media::KeyErrorCB key_error_cb_;
   media::KeyMessageCB key_message_cb_;
 
   // Protects the |decryptor_|. Note that |decryptor_| itself should be thread
   // safe as per the Decryptor interface.
   base::Lock lock_;
 
   media::DecryptorReadyCB decryptor_ready_cb_;
 
-  // The real MediaKeys that manages key operations for the ProxyDecryptor.
-  // This pointer is protected by the |lock_|.
-  scoped_ptr<media::MediaKeys> media_keys_;
-
   DISALLOW_COPY_AND_ASSIGN(ProxyDecryptor);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_RENDERER_MEDIA_CRYPTO_PROXY_DECRYPTOR_H_