diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-21 08:05:28 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-21 08:05:28 +0000 |
| commit | 8930d471c128ed74b11beaa78ea1b171c1ac7157 (patch) | |
| tree | 5a20cb03c8e5019385709bc069e67f03488c41a1 /chrome/renderer/render_widget_unittest.cc | |
| parent | a41fae8db8109bfeed047015b77b0d9227118540 (diff) | |
| download | chromium_src-8930d471c128ed74b11beaa78ea1b171c1ac7157.zip chromium_src-8930d471c128ed74b11beaa78ea1b171c1ac7157.tar.gz chromium_src-8930d471c128ed74b11beaa78ea1b171c1ac7157.tar.bz2 | |
Refactor code from RenderThread and PluginThread and move it to ChildThread. ChildProcess now owns the ChildThread, which removes duplicate code and simplifies things.
Clean up ChildProcess, there really was no need for all the templates and statics in it and its subclasses.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=10080
Review URL: http://codereview.chromium.org/21502
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_widget_unittest.cc')
| -rw-r--r-- | chrome/renderer/render_widget_unittest.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/renderer/render_widget_unittest.cc b/chrome/renderer/render_widget_unittest.cc index 6c2b24f..6937a64 100644 --- a/chrome/renderer/render_widget_unittest.cc +++ b/chrome/renderer/render_widget_unittest.cc @@ -28,20 +28,17 @@ class RenderWidgetTest : public testing::Test { private: // testing::Test virtual void SetUp() { - MockProcess::GlobalInit(); - + mock_process_.reset(new MockProcess()); render_thread_.set_routing_id(kRouteId); widget_ = RenderWidget::Create(kOpenerId, &render_thread_, true); ASSERT_TRUE(widget_); } virtual void TearDown() { widget_ = NULL; - - // There is a delayed task that the child process posts to terminate the - // message loop so we need to spin the message loop to delete the task. - MockProcess::GlobalCleanup(); - msg_loop_.Run(); + mock_process_.reset(); } + + scoped_ptr<MockProcess> mock_process_; }; } // namespace |