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

content/test/content_browser_test.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_TEST_CONTENT_BROWSER_TEST_H_
 #define CONTENT_TEST_CONTENT_BROWSER_TEST_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/browser_test_base.h"
@@ skipping 10 matching lines @@
   ContentBrowserTest();
   virtual ~ContentBrowserTest();
 
   // testing::Test:
   virtual void SetUp() OVERRIDE;
   virtual void TearDown() OVERRIDE;
 
   // 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();
 
   // Creates an off-the-record window and loads about:blank.
   Shell* CreateOffTheRecordBrowser();
 
   // Returns the window for the test.
   Shell* shell() const { return shell_; }
 
  private:
-  scoped_ptr<ShellMainDelegate> shell_main_delegate_;
-
   Shell* shell_;
 
   bool setup_called_;
 
+#if defined(OS_ANDROID)
+  // For all other platforms, this is done automatically when calling into
+  // ContentMain. For Android we set things up manually.
+  scoped_ptr<ShellMainDelegate> shell_main_delegate_;
+
   // ContentRendererClient when running in single-process mode.
   scoped_ptr<ContentRendererClient> single_process_renderer_client_;
+#endif
 };
 
 }  // namespace content
 
 #endif  // CONTENT_TEST_CONTENT_BROWSER_TEST_H_