Revert 222074 "Refactor KeySystems code to call a function to po..."

trunk/src/content/public/renderer/key_system_info.h

Index: trunk/src/content/public/renderer/key_system_info.h
===================================================================
--- trunk/src/content/public/renderer/key_system_info.h	(revision 222090)
+++ trunk/src/content/public/renderer/key_system_info.h	(working copy)
@@ -1,65 +0,0 @@
-// 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 CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_
-#define CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_
-
-#include <string>
-#include <utility>
-#include <vector>
-
-#include "base/basictypes.h"
-#include "content/common/content_export.h"
-
-// Definitions:
-// * Key system
-//    https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#key-system
-// * Concrete key system
-//    A key system string that can be instantiated, such as
-//    via the MediaKeys constructor. Examples include "org.w3.clearkey" and
-//    "com.widevine.alpha".
-// * Abstract key system
-//    A key system string that cannot be instantiated like a concrete key system
-//    but is otherwise useful, such as in discovery using isTypeSupported().
-// * Parent key system
-//    A key system string that is one level up from the child key system. It may
-//    be an abstract key system.
-//    As an example, "com.example" is the parent of "com.example.foo".
-
-namespace content {
-
-// Contains information about an EME key system as well as how to instantiate
-// the corresponding CDM.
-struct CONTENT_EXPORT KeySystemInfo {
-  // Represents container-codec combinations. The second string may contain zero
-  // or more codecs separated by commas.
-  typedef std::pair<std::string, std::string> ContainerCodecsPair;
-
-  explicit KeySystemInfo(const std::string& key_system);
-  ~KeySystemInfo();
-
-  std::string key_system;
-
-  // Specifies container and codec combinations supported by |key_system|.
-  // Multiple codecs may be listed for each container.
-  // In all cases, the container without a codec is also always supported.
-  std::vector<ContainerCodecsPair> supported_types;
-
-  // A hierarchical parent for |key_system|. This value can be used to check
-  // supported types but cannot be used to instantiate a MediaKeys object.
-  // Only one parent key system is currently supported per concrete key system.
-  std::string parent_key_system;
-
-  // The following indicate how the corresponding CDM should be instantiated.
-  bool use_aes_decryptor;
-#if defined(ENABLE_PEPPER_CDMS)
-  std::string pepper_type;
-#elif defined(OS_ANDROID)
-  std::vector<uint8> uuid;
-#endif
-};
-
-}  // namespace content
-
-#endif  // CONTENT_PUBLIC_RENDERER_KEY_SYSTEM_INFO_H_