Revert r21117 as it caused reliability failures....

chrome/renderer/renderer_main.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/field_trial.h"
 #include "base/histogram.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/platform_thread.h"
 #include "base/process_util.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/stats_counters.h"
 #include "base/string_util.h"
 #include "base/system_monitor.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_counters.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
 #include "chrome/renderer/render_process.h"
-#include "chrome/renderer/render_thread.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 
 #if defined(OS_LINUX)
 #include "chrome/app/breakpad_linux.h"
 #endif
 
 // This function provides some ways to test crash and assertion handling
 // behavior of the renderer.
 static void HandleRendererErrorTestParameters(const CommandLine& command_line) {
@@ skipping 42 matching lines @@
   // flag allowing us to attach a debugger.
   // Do not move this function down since that would mean we can't easily debug
   // whatever occurs before it.
   HandleRendererErrorTestParameters(parsed_command_line);
 
   RendererMainPlatformDelegate platform(parameters);
 
   StatsScope<StatsCounterTimer>
       startup_timer(chrome::Counters::renderer_main());
 
-  // The main message loop of the renderer services doesn't have IO or UI tasks,
-  // unless in-process-plugins is used.
-  MessageLoop main_message_loop(RenderProcess::InProcessPlugins() ?
-              MessageLoop::TYPE_UI : MessageLoop::TYPE_DEFAULT);
-
+  // The main thread of the renderer services IO.
+  MessageLoopForIO main_message_loop;
   std::wstring app_name = chrome::kBrowserAppName;
   PlatformThread::SetName(WideToASCII(app_name + L"_RendererMain").c_str());
 
   // Initialize the SystemMonitor
   base::SystemMonitor::Start();
 
   platform.PlatformInitialize();
 
   bool no_sandbox = parsed_command_line.HasSwitch(switches::kNoSandbox);
   platform.InitSandboxTests(no_sandbox);
@@ skipping 10 matching lines @@
   // Ensure any field trials in browser are reflected into renderer.
   if (parsed_command_line.HasSwitch(switches::kForceFieldTestNameAndValue)) {
     std::string persistent(WideToASCII(parsed_command_line.GetSwitchValue(
         switches::kForceFieldTestNameAndValue)));
     bool ret = field_trial.StringAugmentsState(persistent);
     DCHECK(ret);
   }
 
   {
     RenderProcess render_process;
-    render_process.set_main_thread(new RenderThread());
     bool run_loop = true;
     if (!no_sandbox) {
       run_loop = platform.EnableSandbox();
     }
 
     platform.RunSandboxTests();
 
     startup_timer.Stop();  // End of Startup Time Measurement.
 
     if (run_loop) {
       // Load the accelerator table from the browser executable and tell the
       // message loop to use it when translating messages.
       if (pool) pool->Recycle();
       MessageLoop::current()->Run();
     }
   }
   platform.PlatformUninitialize();
   return 0;
 }