Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1184)

Unified Diff: chrome/test/base/chrome_test_launcher.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/chrome_render_view_test.cc ('k') | chrome/test/base/chrome_test_suite.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/chrome_test_launcher.cc
===================================================================
--- chrome/test/base/chrome_test_launcher.cc (revision 257432)
+++ chrome/test/base/chrome_test_launcher.cc (working copy)
@@ -85,14 +85,7 @@
protected:
virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE {
-#if defined(OS_WIN) || defined (OS_LINUX)
return new ChromeMainDelegate();
-#else
- // This delegate is only guaranteed to link on linux and windows, so just
- // bail out if we are on any other platform.
- NOTREACHED();
- return NULL;
-#endif
}
virtual void AdjustDefaultParallelJobs(int* default_jobs) OVERRIDE {
« no previous file with comments | « chrome/test/base/chrome_render_view_test.cc ('k') | chrome/test/base/chrome_test_suite.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698