Changed TestShellWebMimeRegistryImpl to blacklist rather than whitelist containers and codecs.

webkit/tools/test_shell/test_shell_webmimeregistry_impl.h

 // Copyright (c) 2011 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_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 11 matching lines @@
   //
   // Media layout tests use canPlayType() to determine the test input files.
   // Different flavours of Chromium support different codecs, which has an
   // impact on how canPlayType() behaves.  Since Chromium's baselines are
   // generated against ogg/vorbis/theora content we need to lock down how
   // canPlayType() behaves when running layout tests.
   virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
       const WebKit::WebString&, const WebKit::WebString&) OVERRIDE;
 
  private:
-  bool IsSupportedMediaMimeType(const std::string& mime_type);
-  bool AreSupportedMediaCodecs(const std::vector<std::string>& codecs);
+  bool IsConditionalMediaMimeType(const std::string& mime_type);
+  bool HasConditionalMediaCodecs(const std::vector<std::string>& codecs);
 
   typedef base::hash_set<std::string> MimeMappings;
-  MimeMappings media_map_;
-  MimeMappings codecs_map_;
+  MimeMappings conditional_media_map_;
+  MimeMappings conditional_codecs_map_;
 
   DISALLOW_COPY_AND_ASSIGN(TestShellWebMimeRegistryImpl);
 };
 
 #endif  // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBMIMEREGISTRY_IMPL_H_