Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

content/test/content_browser_test.h

Index: content/test/content_browser_test.h
===================================================================
--- content/test/content_browser_test.h	(revision 257128)
+++ content/test/content_browser_test.h	(working copy)
@@ -12,9 +12,7 @@
 class GURL;
 
 namespace content {
-class ContentRendererClient;
 class Shell;
-class ShellMainDelegate;
 
 class ContentBrowserTest : public BrowserTestBase {
  protected:
@@ -28,10 +26,6 @@
   // BrowserTestBase:
   virtual void RunTestOnMainThreadLoop() OVERRIDE;
 
-  // Must be called before or during setup.
-  void SetContentRendererClient(
-      scoped_ptr<ContentRendererClient> renderer_client);
-
  protected:
   // Creates a new window and loads about:blank.
   Shell* CreateBrowser();
@@ -43,14 +37,9 @@
   Shell* shell() const { return shell_; }
 
  private:
-  scoped_ptr<ShellMainDelegate> shell_main_delegate_;
-
   Shell* shell_;
 
   bool setup_called_;
-
-  // ContentRendererClient when running in single-process mode.
-  scoped_ptr<ContentRendererClient> single_process_renderer_client_;
 };
 
 }  // namespace content