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, 3 insertions, 4 deletions

diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index 851a6f3..375831a 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -29,8 +29,8 @@
 
 // main() routine for running as the plugin process.
 int PluginMain(const MainFunctionParams& parameters) {
-  // The main thread of the plugin services UI.
-  MessageLoop main_message_loop(MessageLoop::TYPE_UI);
+  // The main thread of the plugin services IO.
+  MessageLoopForIO main_message_loop;
   std::wstring app_name = chrome::kBrowserAppName;
   PlatformThread::SetName(WideToASCII(app_name + L"_PluginMain").c_str());
 
@@ -80,8 +80,7 @@ int PluginMain(const MainFunctionParams& parameters) {
   }
 
   {
-    ChildProcess plugin_process;
-    plugin_process.set_main_thread(new PluginThread());
+    ChildProcess plugin_process(new PluginThread());
 #if defined(OS_WIN)
     if (!no_sandbox && target_services)
       target_services->LowerToken();