Revert r21117 as it caused reliability failures.

Also included in this revert: r21165, r21180, and a couple valgrind suppression edits

TBR=huanr

Review URL: http://codereview.chromium.org/155876

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21216 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index aa370a5..bb2e297 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -18,8 +18,7 @@ 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());
-    mock_process_->set_main_thread(new RenderThread(kThreadName));
+    mock_process_.reset(new MockProcess(new RenderThread(kThreadName)));
   }
 
   virtual void TearDown() {
@@ -35,13 +34,15 @@ class RenderThreadTest : public testing::Test {
   }
 
  protected:
-  MessageLoop message_loop_;
+  MessageLoopForIO message_loop_;
   scoped_ptr<MockProcess> mock_process_;
   IPC::Channel *channel_;
 };
 
 TEST_F(RenderThreadTest, TestGlobal) {
-  ASSERT_TRUE(RenderThread::current());
+  // Can't reach the RenderThread object on other threads, since it's not
+  // thread-safe!
+  ASSERT_FALSE(RenderThread::current());
 }
 
 TEST_F(RenderThreadTest, TestVisitedMsg) {
@@ -54,7 +55,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_->main_thread()->Send(msg);
+  mock_process_->child_thread()->Send(msg);
 
   // No need to delete msg; per Message::Send() documentation, "The
   // implementor takes ownership of the given Message regardless of