Third patch in getting rid of caching MessageLoop pointers and always using ChromeThread instead.

BUG=25354

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

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

3 files changed, 7 insertions, 15 deletions

diff --git a/chrome/browser/worker_host/worker_process_host.cc b/chrome/browser/worker_host/worker_process_host.cc
index 54446b3..eb6d2fe 100644
--- a/chrome/browser/worker_host/worker_process_host.cc
+++ b/chrome/browser/worker_host/worker_process_host.cc
@@ -16,7 +16,7 @@
 #include "base/path_service.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
-#include "chrome/browser/browser_process.h"
+#include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/child_process_security_policy.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
@@ -77,10 +77,10 @@ WorkerProcessHost::~WorkerProcessHost() {
       NotificationService::NoDetails());
 
   // If we crashed, tell the RenderViewHost.
-  MessageLoop* ui_loop = WorkerService::GetInstance()->ui_loop();
   for (Instances::iterator i = instances_.begin(); i != instances_.end(); ++i) {
-    ui_loop->PostTask(FROM_HERE, new WorkerCrashTask(
-        i->renderer_id, i->render_view_route_id));
+    ChromeThread::PostTask(
+        ChromeThread::UI, FROM_HERE,
+        new WorkerCrashTask(i->renderer_id, i->render_view_route_id));
   }
 
   ChildProcessSecurityPolicy::GetInstance()->Remove(id());
diff --git a/chrome/browser/worker_host/worker_service.cc b/chrome/browser/worker_host/worker_service.cc
index d37314b..a54bb2a 100644
--- a/chrome/browser/worker_host/worker_service.cc
+++ b/chrome/browser/worker_host/worker_service.cc
@@ -28,8 +28,7 @@ WorkerService* WorkerService::GetInstance() {
 
 WorkerService::WorkerService()
     : next_worker_route_id_(0),
-      resource_dispatcher_host_(NULL),
-      ui_loop_(NULL) {
+      resource_dispatcher_host_(NULL) {
   // Receive a notification if a message filter or WorkerProcessHost is deleted.
   registrar_.Add(this, NotificationType::RESOURCE_MESSAGE_FILTER_SHUTDOWN,
                  NotificationService::AllSources());
@@ -38,10 +37,8 @@ WorkerService::WorkerService()
                  NotificationService::AllSources());
 }
 
-void WorkerService::Initialize(ResourceDispatcherHost* rdh,
-                               MessageLoop* ui_loop) {
+void WorkerService::Initialize(ResourceDispatcherHost* rdh) {
   resource_dispatcher_host_ = rdh;
-  ui_loop_ = ui_loop;
 }
 
 WorkerService::~WorkerService() {
diff --git a/chrome/browser/worker_host/worker_service.h b/chrome/browser/worker_host/worker_service.h
index a3e71031..0bd6f58 100644
--- a/chrome/browser/worker_host/worker_service.h
+++ b/chrome/browser/worker_host/worker_service.h
@@ -14,8 +14,6 @@
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 
-
-class MessageLoop;
 class WorkerProcessHost;
 class ResourceDispatcherHost;
 
@@ -25,7 +23,7 @@ class WorkerService : public NotificationObserver {
   static WorkerService* GetInstance();
 
   // Initialize the WorkerService.  OK to be called multiple times.
-  void Initialize(ResourceDispatcherHost* rdh, MessageLoop* ui_loop);
+  void Initialize(ResourceDispatcherHost* rdh);
 
   // Creates a dedicated worker.  Returns true on success.
   bool CreateDedicatedWorker(const GURL &url,
@@ -42,8 +40,6 @@ class WorkerService : public NotificationObserver {
   // forwarded to the worker process.
   void ForwardMessage(const IPC::Message& message, int sender_id);
 
-  MessageLoop* ui_loop() { return ui_loop_; }
-
   int next_worker_route_id() { return ++next_worker_route_id_; }
 
   // TODO(dimich): This code assumes there is 1 worker per worker process, which
@@ -95,7 +91,6 @@ class WorkerService : public NotificationObserver {
   NotificationRegistrar registrar_;
   int next_worker_route_id_;
   ResourceDispatcherHost* resource_dispatcher_host_;
-  MessageLoop* ui_loop_;
 
   WorkerProcessHost::Instances queued_workers_;