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

content/shell/renderer/shell_content_renderer_client.h

 // 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.
 
 #ifndef CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_
 #define CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "content/public/renderer/content_renderer_client.h"
 
 namespace WebKit {
 class WebFrame;
 class WebPlugin;
 struct WebPluginParams;
 }
 
 namespace WebTestRunner {
 class WebTestProxyBase;
 }
 
 namespace webkit_glue {
 class MockWebHyphenator;
 }
 
 class MockWebClipboardImpl;
-class TestShellWebMimeRegistryImpl;
 
 namespace content {
 
 class ShellRenderProcessObserver;
 
 class ShellContentRendererClient : public ContentRendererClient {
  public:
   static ShellContentRendererClient* Get();
 
   ShellContentRendererClient();
   virtual ~ShellContentRendererClient();
 
   void LoadHyphenDictionary(base::PlatformFile dict_file);
 
   // ContentRendererClient implementation.
   virtual void RenderThreadStarted() OVERRIDE;
   virtual void RenderViewCreated(RenderView* render_view) OVERRIDE;
   virtual bool OverrideCreatePlugin(
       RenderView* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params,
       WebKit::WebPlugin** plugin) OVERRIDE;
   virtual WebKit::WebMediaStreamCenter* OverrideCreateWebMediaStreamCenter(
       WebKit::WebMediaStreamCenterClient* client) OVERRIDE;
   virtual WebKit::WebRTCPeerConnectionHandler*
   OverrideCreateWebRTCPeerConnectionHandler(
       WebKit::WebRTCPeerConnectionHandlerClient* client) OVERRIDE;
   virtual WebKit::WebClipboard* OverrideWebClipboard() OVERRIDE;
-  virtual WebKit::WebMimeRegistry* OverrideWebMimeRegistry() OVERRIDE;

[jochen (gone - plz use gerrit), 2013/06/20 10:39:44]

afaik content shell was the only consumer of this API, so you could also delete
it from ContentRendererClient

[scherkus (not reviewing), 2013/06/20 22:28:42]

Done.

   virtual WebKit::WebHyphenator* OverrideWebHyphenator() OVERRIDE;
   virtual WebKit::WebThemeEngine* OverrideThemeEngine() OVERRIDE;
   virtual bool AllowBrowserPlugin(
       WebKit::WebPluginContainer* container) const OVERRIDE;
 
  private:
    void WebTestProxyCreated(RenderView* render_view,
                             WebTestRunner::WebTestProxyBase* proxy);
 
   scoped_ptr<ShellRenderProcessObserver> shell_observer_;
   scoped_ptr<MockWebClipboardImpl> clipboard_;
-  scoped_ptr<TestShellWebMimeRegistryImpl> mime_registry_;
   scoped_ptr<webkit_glue::MockWebHyphenator> hyphenator_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_SHELL_SHELL_CONTENT_RENDERER_CLIENT_H_