Hide WorkerProcessHost from chrome.

chrome/browser/ui/webui/workers_ui.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/webui/workers_ui.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_writer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/debugger/devtools_window.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
 #include "chrome/browser/ui/webui/chrome_web_ui_data_source.h"
 #include "chrome/common/url_constants.h"
-#include "content/browser/worker_host/worker_process_host.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/browser/worker_service.h"
 #include "content/public/browser/worker_service_observer.h"
 #include "content/public/browser/web_ui_message_handler.h"
 #include "content/public/common/process_type.h"
 #include "grit/generated_resources.h"
@@ skipping 16 matching lines @@
 
 static const char kWorkerProcessHostIdField[]  = "workerProcessHostId";
 static const char kWorkerRouteIdField[]  = "workerRouteId";
 static const char kUrlField[]  = "url";
 static const char kNameField[]  = "name";
 static const char kPidField[]  = "pid";
 
 namespace {
 
 
-DictionaryValue* BuildWorkerData(const ChildProcessData& data,
-    const WorkerProcessHost::WorkerInstance& instance) {
+DictionaryValue* BuildWorkerData(
+    const GURL& url,
+    const string16& name,
+    int process_id,
+    int route_id,
+    base::ProcessHandle handle) {
   DictionaryValue* worker_data = new DictionaryValue();
-  worker_data->SetInteger(kWorkerProcessHostIdField, data.id);
-  worker_data->SetInteger(kWorkerRouteIdField, instance.worker_route_id());
-  worker_data->SetString(kUrlField, instance.url().spec());
-  worker_data->SetString(kNameField, instance.name());
-  worker_data->SetInteger(kPidField, base::GetProcId(data.handle));
+  worker_data->SetInteger(kWorkerProcessHostIdField, process_id);
+  worker_data->SetInteger(kWorkerRouteIdField, route_id);
+  worker_data->SetString(kUrlField, url.spec());
+  worker_data->SetString(kNameField, name);
+  worker_data->SetInteger(kPidField, base::GetProcId(handle));
   return worker_data;
 }
 
 class WorkersUIHTMLSource : public ChromeWebUIDataSource {
  public:
   WorkersUIHTMLSource();
 
   virtual void StartDataRequest(const std::string& path,
                                 bool is_incognito,
                                 int request_id);
@@ skipping 13 matching lines @@
                                            bool is_incognito,
                                            int request_id) {
   if (path == kWorkersDataFile) {
     SendSharedWorkersData(request_id);
   } else {
     ChromeWebUIDataSource::StartDataRequest(path, is_incognito, request_id);
   }
 }
 
 void WorkersUIHTMLSource::SendSharedWorkersData(int request_id) {
-    ListValue workers_list;
-    for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
-      const WorkerProcessHost::Instances& instances = iter->instances();
-      for (WorkerProcessHost::Instances::const_iterator i = instances.begin();
-           i != instances.end(); ++i) {
-         workers_list.Append(BuildWorkerData(iter.GetData(), *i));
-      }
-    }
+  ListValue workers_list;
+  std::vector<WorkerService::WorkerInfo> worker_info =
+      WorkerService::GetInstance()->GetWorkers();
+  for (size_t i = 0; i < worker_info.size(); ++i) {
+    workers_list.Append(BuildWorkerData(
+        worker_info[i].url, worker_info[i].name, worker_info[i].process_id,
+        worker_info[i].route_id, worker_info[i].handle));
+  }
 
-    std::string json_string;
-    base::JSONWriter::Write(&workers_list, false, &json_string);
+  std::string json_string;
+  base::JSONWriter::Write(&workers_list, false, &json_string);
 
-    SendResponse(request_id, base::RefCountedString::TakeString(&json_string));
+  SendResponse(request_id, base::RefCountedString::TakeString(&json_string));
 }
 
 class WorkersDOMHandler : public WebUIMessageHandler {
  public:
   WorkersDOMHandler() {}
   virtual ~WorkersDOMHandler() {}
 
  private:
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
@@ skipping 29 matching lines @@
   Profile* profile = Profile::FromWebUI(web_ui());
   if (!profile)
     return;
   DevToolsAgentHost* agent_host =
       DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker(
           worker_process_host_id,
           worker_route_id);
   DevToolsWindow::OpenDevToolsWindowForWorker(profile, agent_host);
 }
 
-static void TerminateWorker(int worker_process_id, int worker_route_id) {
-  for (WorkerProcessHostIterator iter; !iter.Done(); ++iter) {
-      if (iter.GetData().id == worker_process_id) {
-      iter->TerminateWorker(worker_route_id);
-      return;
-    }
-  }
+static void TerminateWorker(int process_id, int route_id) {
+  WorkerService::GetInstance()->TerminateWorker(process_id, route_id);
 }
 
 void WorkersDOMHandler::HandleTerminateWorker(const ListValue* args) {
   std::string worker_process_host_id_str;
   std::string worker_route_id_str;
   int worker_process_host_id;
   int worker_route_id;
   CHECK(args->GetSize() == 2);
   CHECK(args->GetString(0, &worker_process_host_id_str));
   CHECK(args->GetString(1, &worker_route_id_str));
@@ skipping 26 matching lines @@
         base::Bind(&WorkerCreationDestructionListener::UnregisterObserver,
                    this));
   }
 
  private:
   friend class base::RefCountedThreadSafe<WorkerCreationDestructionListener>;
   virtual ~WorkerCreationDestructionListener() {
   }
 
   virtual void WorkerCreated(
-      WorkerProcessHost* process,
-      const WorkerProcessHost::WorkerInstance& instance) OVERRIDE {
+      const GURL& url,
+      const string16& name,
+      int process_id,
+      int route_id) OVERRIDE {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(
-            &WorkerCreationDestructionListener::NotifyWorkerCreated,
-            this, base::Owned(BuildWorkerData(process->GetData(), instance))));
+        base::Bind(&WorkerCreationDestructionListener::NotifyWorkerCreated,
+                   this,
+                   base::Owned(BuildWorkerData(url, name, process_id, route_id,
+                                               base::kNullProcessHandle))));
   }
-  virtual void WorkerDestroyed(
-      WorkerProcessHost* process,
-      int worker_route_id) OVERRIDE {
+  virtual void WorkerDestroyed(int process_id, int route_id) OVERRIDE {
     DictionaryValue* worker_data = new DictionaryValue();
-    worker_data->SetInteger(kWorkerProcessHostIdField, process->GetData().id);
-    worker_data->SetInteger(kWorkerRouteIdField, worker_route_id);
+    worker_data->SetInteger(kWorkerProcessHostIdField, process_id);
+    worker_data->SetInteger(kWorkerRouteIdField, route_id);
 
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&WorkerCreationDestructionListener::NotifyWorkerDestroyed,
                    this, base::Owned(worker_data)));
   }
-  virtual void WorkerContextStarted(WorkerProcessHost*, int) OVERRIDE {}
 
   void NotifyWorkerCreated(DictionaryValue* worker_data) {
     if (workers_ui_) {
       workers_ui_->web_ui()->CallJavascriptFunction(
           "workerCreated", *worker_data);
     }
   }
 
   void NotifyWorkerDestroyed(DictionaryValue* worker_data) {
     if (workers_ui_) {
@@ skipping 21 matching lines @@
 
   // Set up the chrome://workers/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 WorkersUI::~WorkersUI() {
   observer_->WorkersUIDestroyed();
   observer_ = NULL;
 }