Changed TestShellWebMimeRegistryImpl to blacklist rather than whitelist containers and codecs.

webkit/tools/test_shell/test_shell_webmimeregistry_impl.h

Index: webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
diff --git a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
index 2c8ad6cea0433508df3e83feab7902bafde61951..101ba75028350b13b10854d66ddeee6528b712ee 100644
--- a/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
+++ b/webkit/tools/test_shell/test_shell_webmimeregistry_impl.h
@@ -29,12 +29,12 @@ class TestShellWebMimeRegistryImpl
       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);
 };