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

trunk/src/content/renderer/media/crypto/key_systems_unittest.cc

 // 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.
 
 #include <string>
 #include <vector>
 
-#include "content/public/common/content_client.h"
-#include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/media/crypto/key_systems.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 #include "widevine_cdm_version.h"  // In SHARED_INTERMEDIATE_DIR.
 
 // Death tests are not always available, including on Android.
 // EXPECT_DEBUG_DEATH_PORTABLE executes tests correctly except in the case that
 // death tests are not available and NDEBUG is not defined.
 #if defined(GTEST_HAS_DEATH_TEST) && !defined(OS_ANDROID)
@@ skipping 113 matching lines @@
 
     aac_codec_.push_back("mp4a");
 
     avc1_and_aac_codecs_.push_back("avc1");
     avc1_and_aac_codecs_.push_back("mp4a");
 
     unknown_codec_.push_back("foo");
 
     mixed_codecs_.push_back("vorbis");
     mixed_codecs_.push_back("avc1");
-
-    SetRendererClientForTesting(&content_renderer_client_);
   }
 
   typedef std::vector<std::string> CodecVector;
 
   const CodecVector& no_codecs() const { return no_codecs_; }
 
   const CodecVector& vp8_codec() const { return vp8_codec_; }
   const CodecVector& vp80_codec() const { return vp80_codec_; }
   const CodecVector& vorbis_codec() const { return vorbis_codec_; }
   const CodecVector& vp8_and_vorbis_codecs() const {
@@ skipping 27 matching lines @@
   CodecVector avc1_extended_codec_;
   CodecVector avc1_dot_codec_;
   CodecVector avc2_codec_;
   CodecVector aac_codec_;
   CodecVector avc1_and_aac_codecs_;
 
   CodecVector unknown_codec_;
 
   CodecVector mixed_codecs_;
 
-  ContentRendererClient content_renderer_client_;
 };
 
 TEST_F(KeySystemsTest, ClearKey_Basic) {
   EXPECT_TRUE(IsConcreteSupportedKeySystem(WebString::fromUTF8(kClearKey)));
   EXPECT_TRUE(IsSupportedKeySystemWithMediaMimeType(
       "video/webm", no_codecs(), kClearKey));
 
   // Not yet out from behind the vendor prefix.
   EXPECT_FALSE(IsConcreteSupportedKeySystem("org.w3.clearkey"));
   EXPECT_FALSE(IsSupportedKeySystemWithMediaMimeType(
@@ skipping 640 matching lines @@
   EXPECT_TRUE(uuid.empty());
 
   EXPECT_TRUE(GetUUID(kClearKey).empty());
 
   EXPECT_DEBUG_DEATH_PORTABLE(uuid = GetUUID(""), " is not a concrete system");
   EXPECT_TRUE(uuid.empty());
 }
 #endif  // defined(OS_ANDROID)
 
 }  // namespace content