Add ProxyDecryptor which wraps concrete Decryptor implementations.

webkit/media/crypto/key_systems.cc

 // 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.
 
-#include "webkit/media/key_systems.h"
+#include "webkit/media/crypto/key_systems.h"
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 namespace webkit_media {
 
 namespace {
 
-const char kClearKeyKeySystem[] = "webkit-org.w3.clearkey";
-
 struct MediaFormatAndKeySystem {
   const char* mime_type;
   const char* codec;
   const char* key_system;
 };
 
 static const MediaFormatAndKeySystem
 supported_format_key_system_combinations[] = {
   // TODO(ddorwin): Reconsider based on how usage of this class evolves.
   // For now, this class is stateless, so we do not have the opportunity to
@@ skipping 44 matching lines @@
   for (size_t i = 0; i < codecs.size(); ++i) {
     if (!IsSupportedKeySystemWithContainerAndCodec(
             mime_type, codecs[i], key_system))
       return false;
   }
 
   return true;
 }
 
 }  // namespace webkit_media