From 42f1d782153f79b0b43bcb17db7dc4979bc08814 Mon Sep 17 00:00:00 2001 From: "nsylvain@chromium.org" Date: Thu, 23 Jul 2009 18:17:55 +0000 Subject: Unrevert 21355 because the revert might be causing the worker tests failures. Review URL: http://codereview.chromium.org/159276 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21412 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/renderer/render_thread_unittest.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'chrome/renderer/render_thread_unittest.cc') diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc index 76491fe..e22cabb 100644 --- a/chrome/renderer/render_thread_unittest.cc +++ b/chrome/renderer/render_thread_unittest.cc @@ -18,7 +18,8 @@ class RenderThreadTest : public testing::Test { virtual void SetUp() { // Need a MODE_SERVER to make MODE_CLIENTs (like a RenderThread) happy. channel_ = new IPC::Channel(kThreadName, IPC::Channel::MODE_SERVER, NULL); - mock_process_.reset(new MockProcess(new RenderThread(kThreadName))); + mock_process_.reset(new MockProcess()); + mock_process_->set_main_thread(new RenderThread(kThreadName)); } virtual void TearDown() { @@ -34,15 +35,13 @@ class RenderThreadTest : public testing::Test { } protected: - MessageLoopForIO message_loop_; + MessageLoop message_loop_; scoped_ptr mock_process_; IPC::Channel *channel_; }; TEST_F(RenderThreadTest, TestGlobal) { - // Can't reach the RenderThread object on other threads, since it's not - // thread-safe! - ASSERT_FALSE(RenderThread::current()); + ASSERT_TRUE(RenderThread::current()); } TEST_F(RenderThreadTest, TestVisitedMsg) { @@ -55,7 +54,7 @@ TEST_F(RenderThreadTest, TestVisitedMsg) { ASSERT_TRUE(msg); // Message goes nowhere, but this confirms Init() has happened. // Unusually (?), RenderThread() Start()s itself in it's constructor. - mock_process_->child_thread()->Send(msg); + mock_process_->main_thread()->Send(msg); // No need to delete msg; per Message::Send() documentation, "The // implementor takes ownership of the given Message regardless of -- cgit v1.1