Simplify how Content*Client interfaces are created. Instead of depending on the embedder to know wh…

content/shell/shell_main_delegate.h

Index: content/shell/shell_main_delegate.h
===================================================================
--- content/shell/shell_main_delegate.h	(revision 140381)
+++ content/shell/shell_main_delegate.h	(working copy)
@@ -14,8 +14,6 @@
 namespace content {
 class ShellContentBrowserClient;
 class ShellContentRendererClient;
-class ShellContentPluginClient;
-class ShellContentUtilityClient;
 }  // namespace content
 
 class ShellMainDelegate : public content::ContentMainDelegate {
@@ -23,23 +21,21 @@
   ShellMainDelegate();
   virtual ~ShellMainDelegate();
 
+  // content::ContentMainDelegate implementation:
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
   virtual void PreSandboxStartup() OVERRIDE;
   virtual int RunProcess(
       const std::string& process_type,
       const content::MainFunctionParams& main_function_params) OVERRIDE;
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-  virtual void ZygoteForked() OVERRIDE;
-#endif
+  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
+  virtual content::ContentRendererClient*
+      CreateContentRendererClient() OVERRIDE;
 
  private:
-  void InitializeShellContentClient(const std::string& process_type);
   void InitializeResourceBundle();
 
   scoped_ptr<content::ShellContentBrowserClient> browser_client_;
   scoped_ptr<content::ShellContentRendererClient> renderer_client_;
-  scoped_ptr<content::ShellContentPluginClient> plugin_client_;
-  scoped_ptr<content::ShellContentUtilityClient> utility_client_;
   content::ShellContentClient content_client_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellMainDelegate);