Reverting 10080.

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

1 files changed, 15 insertions, 8 deletions

diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index 4192f68..12e6941 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -2,6 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "base/string_util.h"
 #include "base/waitable_event.h"
 #include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/render_messages.h"
@@ -11,33 +12,39 @@
 
 namespace {
 
-const wchar_t kThreadName[] = L"render_thread_unittest";
+const char kThreadName[] = "render_thread_unittest";
 
 class RenderThreadTest : public testing::Test {
  public:
   virtual void SetUp() {
-    mock_process_.reset(new MockProcess(new RenderThread(kThreadName)));
+    MockProcess::GlobalInit();
     // Need a MODE_SERVER to make MODE_CLIENTs (like a RenderThread) happy.
-    channel_ = new IPC::Channel(kThreadName, IPC::Channel::MODE_SERVER, NULL);
+    channel_ = new IPC::Channel(ASCIIToWide(kThreadName),
+                                IPC::Channel::MODE_SERVER, NULL);
   }
 
   virtual void TearDown() {
     message_loop_.RunAllPending();
     delete channel_;
-    mock_process_.reset();
+    MockProcess::GlobalCleanup();
   }
 
- protected:
+ private:
   MessageLoopForIO message_loop_;
-  scoped_ptr<MockProcess> mock_process_;
   IPC::Channel *channel_;
 };
 
 TEST_F(RenderThreadTest, TestGlobal) {
-  ASSERT_TRUE(RenderThread::current());
+  ASSERT_FALSE(g_render_thread);
+  {
+    RenderThread thread(ASCIIToWide(kThreadName));
+    ASSERT_TRUE(g_render_thread);
+  }
+  ASSERT_FALSE(g_render_thread);
 }
 
 TEST_F(RenderThreadTest, TestVisitedMsg) {
+  RenderThread thread(ASCIIToWide(kThreadName));
 #if defined(OS_WIN)
   IPC::Message* msg = new ViewMsg_VisitedLink_NewTable(NULL);
 #elif defined(OS_POSIX)
@@ -47,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);
+  thread.Send(msg);
 
   // No need to delete msg; per Message::Send() documentation, "The
   // implementor takes ownership of the given Message regardless of