Index: content/test/content_test_launcher.cc |
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc |
index 5ab191055bde98f4dab0f44d7fdd21f7914f5d53..e2043fa262c1185ea2e72e80ac66c0b128ad2bea 100644 |
--- a/content/test/content_test_launcher.cc |
+++ b/content/test/content_test_launcher.cc |
@@ -9,7 +9,6 @@ |
#include "base/logging.h" |
#include "base/path_service.h" |
#include "base/test/test_suite.h" |
-#include "content/public/app/content_main.h" |
#include "content/public/common/content_switches.h" |
#include "content/public/test/content_test_suite_base.h" |
#include "content/shell/shell_content_browser_client.h" |
@@ -94,28 +93,6 @@ class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate { |
return std::string(); |
} |
- virtual bool Run(int argc, char** argv, int* return_code) OVERRIDE { |
-#if defined(OS_WIN) || defined(OS_LINUX) |
- CommandLine* command_line = CommandLine::ForCurrentProcess(); |
- if (command_line->HasSwitch(switches::kProcessType)) { |
- ShellMainDelegate delegate; |
-#if defined(OS_WIN) |
- sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
- InitializeSandboxInfo(&sandbox_info); |
- *return_code = |
- ContentMain(GetModuleHandle(NULL), &sandbox_info, &delegate); |
-#elif defined(OS_LINUX) |
- *return_code = ContentMain(argc, |
- const_cast<const char**>(argv), |
- &delegate); |
-#endif // defined(OS_WIN) |
- return true; |
- } |
-#endif // defined(OS_WIN) || defined(OS_LINUX) |
- |
- return false; |
- } |
- |
virtual int RunTestSuite(int argc, char** argv) OVERRIDE { |
return ContentBrowserTestSuite(argc, argv).Run(); |
} |
@@ -127,6 +104,11 @@ class ContentTestLauncherDelegate : public test_launcher::TestLauncherDelegate { |
return true; |
} |
+ protected: |
+ virtual content::ContentMainDelegate* CreateContentMainDelegate() OVERRIDE { |
+ return new ShellMainDelegate(); |
+ } |
+ |
private: |
DISALLOW_COPY_AND_ASSIGN(ContentTestLauncherDelegate); |
}; |