Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1048)

Unified Diff: content/shell/renderer/shell_content_renderer_client.cc

Issue 17447011: Shuffle media-related WebMimeRegistry code from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..346685e4585bad195f2d6cb1210cf9c635a47432 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -23,7 +23,6 @@
#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;
@@ -150,14 +149,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;

Powered by Google App Engine
This is Rietveld 408576698