summaryrefslogtreecommitdiffstats
path: root/content/test/content_browser_test.h
diff options
context:
space:
mode:
Diffstat (limited to 'content/test/content_browser_test.h')
-rw-r--r--content/test/content_browser_test.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/content/test/content_browser_test.h b/content/test/content_browser_test.h
index 0647d4a..457993d9 100644
--- a/content/test/content_browser_test.h
+++ b/content/test/content_browser_test.h
@@ -28,10 +28,6 @@ class ContentBrowserTest : public BrowserTestBase {
// 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 +39,18 @@ class ContentBrowserTest : public BrowserTestBase {
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