Move media related mimetype functionality out of net/ and into media/.

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 a8a6a22d4f3ebc6f6332fc8d82b25d6eab1ef3ef..f987102171540f0aee0bf41ebf6cb3ad699eee45 100644
--- a/content/shell/app/shell_main_delegate.cc
+++ b/content/shell/app/shell_main_delegate.cc
@@ -23,6 +23,7 @@
 #include "content/shell/browser/shell_content_browser_client.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/shell_content_renderer_client.h"
+#include "media/base/mime_util.h"
 #include "net/cookies/cookie_monster.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
@@ -174,7 +175,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
     // 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();
+    media::RemoveProprietaryMediaTypesAndCodecsForTests();
 #endif
 
     if (!WebKitTestPlatformInitialize()) {