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

content/shell/app/shell_main_delegate.cc

 // Copyright (c) 2012 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 "content/shell/app/shell_main_delegate.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 124 matching lines @@
     // painting is enabled. See http://crbug.com/250777
     command_line.AppendSwitch(cc::switches::kDisableImplSidePainting);
 #endif
 
     if (!command_line.HasSwitch(switches::kEnableThreadedCompositing))
       command_line.AppendSwitch(cc::switches::kDisableThreadedAnimation);
     if (command_line.HasSwitch(switches::kEnableSoftwareCompositing))
       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;
       return true;
     }
   }
   SetContentClient(&content_client_);
   return false;
 }
 
@@ skipping 55 matching lines @@
   browser_client_.reset(new ShellContentBrowserClient);
   return browser_client_.get();
 }
 
 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
   renderer_client_.reset(new ShellContentRendererClient);
   return renderer_client_.get();
 }
 
 }  // namespace content