diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 23:14:59 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-23 23:14:59 +0000 |
| commit | 95b2791c43c87191139175592c5e43ad17972d2a (patch) | |
| tree | 717e46b1e28abbef00243c2d3dc6a39a910f0805 /content/test/content_browser_test.cc | |
| parent | 70e7aeaa9fadc8709a3265fc6b0c035405af591d (diff) | |
| download | chromium_src-95b2791c43c87191139175592c5e43ad17972d2a.zip chromium_src-95b2791c43c87191139175592c5e43ad17972d2a.tar.gz chromium_src-95b2791c43c87191139175592c5e43ad17972d2a.tar.bz2 | |
Move plugin_browsertests.cc from browser_tests to content_browsertests.
BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10806056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147983 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.cc')
| -rw-r--r-- | content/test/content_browser_test.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index d3d6163..ff2bfd2 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -10,6 +10,7 @@ #include "base/logging.h" #include "base/message_loop.h" #include "base/path_service.h" +#include "content/public/browser/render_process_host.h" #include "content/public/common/content_switches.h" #include "content/shell/shell.h" #include "content/shell/shell_main_delegate.h" @@ -38,12 +39,14 @@ ContentBrowserTest::~ContentBrowserTest() { } void ContentBrowserTest::SetUp() { - shell_main_delegate_.reset(new content::ShellMainDelegate); + shell_main_delegate_.reset(new ShellMainDelegate); shell_main_delegate_->PreSandboxStartup(); CommandLine* command_line = CommandLine::ForCurrentProcess(); command_line->AppendSwitch(switches::kContentBrowserTest); + SetUpCommandLine(command_line); + #if defined(OS_MACOSX) // See InProcessBrowserTest::PrepareTestCommandLine(). FilePath subprocess_path; @@ -101,10 +104,17 @@ void ContentBrowserTest::RunTestOnMainThreadLoop() { pool.Recycle(); #endif + SetUpOnMainThread(); + RunTestOnMainThread(); #if defined(OS_MACOSX) pool.Recycle(); #endif + + for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator()); + !i.IsAtEnd(); i.Advance()) { + i.GetCurrentValue()->FastShutdownIfPossible(); + } } } // namespace content |