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

webkit/glue/simple_webmimeregistry_impl.h

Index: webkit/glue/simple_webmimeregistry_impl.h
diff --git a/webkit/glue/simple_webmimeregistry_impl.h b/webkit/glue/simple_webmimeregistry_impl.h
index cdf623275c539d2393b2e51fb9a7dd2405045b53..28a2cf32e1a1cef31caeab9eebdb5f266a763ab7 100644
--- a/webkit/glue/simple_webmimeregistry_impl.h
+++ b/webkit/glue/simple_webmimeregistry_impl.h
@@ -2,8 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBMIMEREGISTRY_IMPL_H_
-#define WEBMIMEREGISTRY_IMPL_H_
+#ifndef WEBKIT_GLUE_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
+#define WEBKIT_GLUE_SIMPLE_WEBMIMEREGISTRY_IMPL_H_
+
+#include <string>
 
 #include "base/compiler_specific.h"
 #include "third_party/WebKit/public/platform/WebMimeRegistry.h"
@@ -17,6 +19,10 @@ class WEBKIT_GLUE_EXPORT SimpleWebMimeRegistryImpl :
   SimpleWebMimeRegistryImpl() {}
   virtual ~SimpleWebMimeRegistryImpl() {}
 
+  // Convert a WebString to ASCII, falling back on an empty string in the case
+  // of a non-ASCII string.
+  static std::string ToASCIIOrEmpty(const WebKit::WebString& string);

[ddorwin, 2013/06/21 02:58:19]

Why does this need to be a class member?

[scherkus (not reviewing), 2013/06/21 17:02:16]

So we don't need to duplicate it inside of the content/ impl

+
   // WebMimeRegistry methods:
   virtual WebKit::WebMimeRegistry::SupportsType supportsMIMEType(
       const WebKit::WebString&);
@@ -24,13 +30,8 @@ class WEBKIT_GLUE_EXPORT SimpleWebMimeRegistryImpl :
       const WebKit::WebString&);
   virtual WebKit::WebMimeRegistry::SupportsType supportsJavaScriptMIMEType(
       const WebKit::WebString&);
-  // TODO(ddorwin): Remove after http://webk.it/82983 lands.

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

ddorwin: FYI

   virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(

[ddorwin, 2013/06/21 02:58:19]

Removed the wrong one.

       const WebKit::WebString&, const WebKit::WebString&);
-  virtual WebKit::WebMimeRegistry::SupportsType supportsMediaMIMEType(
-      const WebKit::WebString&,
-      const WebKit::WebString&,
-      const WebKit::WebString&);
   virtual bool supportsMediaSourceMIMEType(const WebKit::WebString&,
                                            const WebKit::WebString&);
   virtual WebKit::WebMimeRegistry::SupportsType supportsNonImageMIMEType(
@@ -45,4 +46,4 @@ class WEBKIT_GLUE_EXPORT SimpleWebMimeRegistryImpl :
 
 }  // namespace webkit_glue
 
-#endif  // WEBMIMEREGISTRY_IMPL_H_
+#endif  // WEBKIT_GLUE_SIMPLE_WEBMIMEREGISTRY_IMPL_H_