Shuffle media-related WebMimeRegistry code from webkit/ to content/.

content/shell/renderer/shell_content_renderer_client.cc

Index: content/shell/renderer/shell_content_renderer_client.cc
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index e1cd50e0167d53aff99e624dab210012c3a4112d..0cb8bfcfbe546c4de680b1ef649e3e79377a091f 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -23,14 +23,12 @@
 #include "v8/include/v8.h"
 #include "webkit/mocks/mock_webhyphenator.h"
 #include "webkit/support/mock_webclipboard_impl.h"
-#include "webkit/support/test_shell_webmimeregistry_impl.h"
 
 using WebKit::WebClipboard;
 using WebKit::WebFrame;
 using WebKit::WebHyphenator;
 using WebKit::WebMediaStreamCenter;
 using WebKit::WebMediaStreamCenterClient;
-using WebKit::WebMimeRegistry;
 using WebKit::WebPlugin;
 using WebKit::WebPluginParams;
 using WebKit::WebRTCPeerConnectionHandler;
@@ -150,14 +148,6 @@ WebClipboard* ShellContentRendererClient::OverrideWebClipboard() {
   return clipboard_.get();
 }
 
-WebMimeRegistry* ShellContentRendererClient::OverrideWebMimeRegistry() {
-  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
-    return NULL;
-  if (!mime_registry_)
-    mime_registry_.reset(new TestShellWebMimeRegistryImpl);
-  return mime_registry_.get();
-}
-
 WebHyphenator* ShellContentRendererClient::OverrideWebHyphenator() {
   if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
     return NULL;