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

ui/views/examples/content_client/examples_main_delegate.h

Index: ui/views/examples/content_client/examples_main_delegate.h
===================================================================
--- ui/views/examples/content_client/examples_main_delegate.h	(revision 140381)
+++ ui/views/examples/content_client/examples_main_delegate.h	(working copy)
@@ -14,12 +14,6 @@
 #include "content/public/app/content_main_delegate.h"
 #include "content/shell/shell_content_client.h"
 
-namespace content {
-class ShellContentRendererClient;
-class ShellContentPluginClient;
-class ShellContentUtilityClient;
-}
-
 namespace views {
 namespace examples {
 
@@ -30,20 +24,15 @@
   ExamplesMainDelegate();
   virtual ~ExamplesMainDelegate();
 
+  // content::ContentMainDelegate implementation
   virtual bool BasicStartupComplete(int* exit_code) OVERRIDE;
   virtual void PreSandboxStartup() OVERRIDE;
-#if defined(OS_POSIX)
-  virtual void ZygoteForked() OVERRIDE;
-#endif  // OS_MACOSX
+  virtual content::ContentBrowserClient* CreateContentBrowserClient() OVERRIDE;
 
  private:
-  void InitializeShellContentClient(const std::string& process_type);
   void InitializeResourceBundle();
 
   scoped_ptr<ExamplesContentBrowserClient> 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(ExamplesMainDelegate);