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

content/shell/app/shell_main_delegate.cc

Index: content/shell/app/shell_main_delegate.cc
diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
index 6064067f2db4b303f85b2ee1040493c920a7070c..ee4f2c83cd9b016698a19d2f0c6f7e6ac5314ce3 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -142,6 +142,13 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
       command_line.AppendSwitch(switches::kEnableSoftwareCompositingGLAdapter);
 
     net::CookieMonster::EnableFileScheme();
+
+    // Unless/until WebM files are added to the media layout tests, we need to
+    // avoid removing MP4/H264/AAC so that layout tests can run on Android.
+#if !defined(OS_ANDROID)
+    net::RemoveProprietaryMediaTypesAndCodecsForTests();

[mmenke, 2013/06/21 19:40:58]

If USE_PROPRIETARY_CODECS is true, should we still be doing this?

[scherkus (not reviewing), 2013/06/21 19:44:29]

yes, that's especially when we want to do it! otherwise our media layout tests
fail due to differences in codec support

when it's not defined the method is still fine to call because the codecs+types
would have never been added in the first place

[mmenke, 2013/06/21 19:47:39]

Hmm...Then why did the old code have the "!defined(USE_PROPRIETARY_CODECS)"?

[scherkus (not reviewing), 2013/06/21 19:56:09]

I suspect it's because before this code was added in
http://src.chromium.org/viewvc/chrome?revision=132463&view=revision the extra
types were behind that define

AFAICT the old code would have worked fine w/o checking the define -- check out
webkit/support/test_shell_webmimeregistry_impl.cc in this CL for how it was
used.

+#endif
+
     if (!WebKitTestPlatformInitialize()) {
       if (exit_code)
         *exit_code = 1;