summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_view_unittest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 05:23:36 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-20 05:23:36 +0000
commit514e711ea07b6a1aef47ebf20250a37bd632402c (patch)
tree632f5e8902cc4231e9c14d0ad28035d63a0c964d /chrome/renderer/render_view_unittest.cc
parent4acbad918766b81f1da3f10e2ae8aa2b10bb0593 (diff)
downloadchromium_src-514e711ea07b6a1aef47ebf20250a37bd632402c.zip
chromium_src-514e711ea07b6a1aef47ebf20250a37bd632402c.tar.gz
chromium_src-514e711ea07b6a1aef47ebf20250a37bd632402c.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. Review URL: http://codereview.chromium.org/21502 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10080 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_view_unittest.cc')
-rw-r--r--chrome/renderer/render_view_unittest.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/chrome/renderer/render_view_unittest.cc b/chrome/renderer/render_view_unittest.cc
index 82aff43..5443c73 100644
--- a/chrome/renderer/render_view_unittest.cc
+++ b/chrome/renderer/render_view_unittest.cc
@@ -60,7 +60,7 @@ class RenderViewTest : public testing::Test {
// testing::Test
virtual void SetUp() {
- MockProcess::GlobalInit();
+ mock_process_.reset(new MockProcess());
render_thread_.set_routing_id(kRouteId);
@@ -77,15 +77,12 @@ class RenderViewTest : public testing::Test {
view_ = 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();
}
MessageLoop msg_loop_;
MockRenderThread render_thread_;
-
+ scoped_ptr<MockProcess> mock_process_;
scoped_refptr<RenderView> view_;
};