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

1 files changed, 8 insertions, 15 deletions

diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index 12e6941..4192f68 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -2,7 +2,6 @@
 // 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"
@@ -12,39 +11,33 @@
 
 namespace {
 
-const char kThreadName[] = "render_thread_unittest";
+const wchar_t kThreadName[] = L"render_thread_unittest";
 
 class RenderThreadTest : public testing::Test {
  public:
   virtual void SetUp() {
-    MockProcess::GlobalInit();
+    mock_process_.reset(new MockProcess(new RenderThread(kThreadName)));
     // Need a MODE_SERVER to make MODE_CLIENTs (like a RenderThread) happy.
-    channel_ = new IPC::Channel(ASCIIToWide(kThreadName),
-                                IPC::Channel::MODE_SERVER, NULL);
+    channel_ = new IPC::Channel(kThreadName, IPC::Channel::MODE_SERVER, NULL);
   }
 
   virtual void TearDown() {
     message_loop_.RunAllPending();
     delete channel_;
-    MockProcess::GlobalCleanup();
+    mock_process_.reset();
   }
 
- private:
+ protected:
   MessageLoopForIO message_loop_;
+  scoped_ptr<MockProcess> mock_process_;
   IPC::Channel *channel_;
 };
 
 TEST_F(RenderThreadTest, TestGlobal) {
-  ASSERT_FALSE(g_render_thread);
-  {
-    RenderThread thread(ASCIIToWide(kThreadName));
-    ASSERT_TRUE(g_render_thread);
-  }
-  ASSERT_FALSE(g_render_thread);
+  ASSERT_TRUE(RenderThread::current());
 }
 
 TEST_F(RenderThreadTest, TestVisitedMsg) {
-  RenderThread thread(ASCIIToWide(kThreadName));
 #if defined(OS_WIN)
   IPC::Message* msg = new ViewMsg_VisitedLink_NewTable(NULL);
 #elif defined(OS_POSIX)
@@ -54,7 +47,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.
-  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