Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / browser / service_worker / embedded_worker_test_helper.cc

diff --git a/src/content/browser/service_worker/embedded_worker_test_helper.cc b/src/content/browser/service_worker/embedded_worker_test_helper.cc
index e607bc0..bfc57bc 100644 (file)
--- a/src/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/src/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -33,17 +33,16 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(int mock_render_process_id)
 }
 
 EmbeddedWorkerTestHelper::~EmbeddedWorkerTestHelper() {
-  if (wrapper_)
+  if (wrapper_.get())
     wrapper_->Shutdown();
 }
 
-void EmbeddedWorkerTestHelper::SimulateAddProcessToWorker(
-    int embedded_worker_id,
+void EmbeddedWorkerTestHelper::SimulateAddProcessToPattern(
+    const GURL& pattern,
     int process_id) {
-  EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
-  ASSERT_TRUE(worker);
   registry()->AddChildProcessSender(process_id, this);
-  worker->AddProcessReference(process_id);
+  wrapper_->process_manager()->AddProcessReferenceToPattern(
+      pattern, process_id);
 }
 
 bool EmbeddedWorkerTestHelper::Send(IPC::Message* message) {
@@ -90,13 +89,15 @@ void EmbeddedWorkerTestHelper::OnStartWorker(
     SimulatePausedAfterDownload(embedded_worker_id);
     return;
   }
-  SimulateWorkerScriptLoaded(embedded_worker_id);
-  SimulateWorkerStarted(next_thread_id_++, embedded_worker_id);
+  SimulateWorkerReadyForInspection(embedded_worker_id);
+  SimulateWorkerScriptLoaded(next_thread_id_++, embedded_worker_id);
+  SimulateWorkerStarted(embedded_worker_id);
 }
 
 void EmbeddedWorkerTestHelper::OnResumeAfterDownload(int embedded_worker_id) {
-  SimulateWorkerScriptLoaded(embedded_worker_id);
-  SimulateWorkerStarted(next_thread_id_++, embedded_worker_id);
+  SimulateWorkerReadyForInspection(embedded_worker_id);
+  SimulateWorkerScriptLoaded(next_thread_id_++, embedded_worker_id);
+  SimulateWorkerStarted(embedded_worker_id);
 }
 
 void EmbeddedWorkerTestHelper::OnStopWorker(int embedded_worker_id) {
@@ -142,16 +143,12 @@ void EmbeddedWorkerTestHelper::OnFetchEvent(
     int embedded_worker_id,
     int request_id,
     const ServiceWorkerFetchRequest& request) {
-  SimulateSend(
-      new ServiceWorkerHostMsg_FetchEventFinished(
-          embedded_worker_id,
-          request_id,
-          SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
-          ServiceWorkerResponse(GURL(""),
-                                200,
-                                "OK",
-                                std::map<std::string, std::string>(),
-                                std::string())));
+  SimulateSend(new ServiceWorkerHostMsg_FetchEventFinished(
+      embedded_worker_id,
+      request_id,
+      SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
+      ServiceWorkerResponse(
+          GURL(""), 200, "OK", ServiceWorkerHeaderMap(), std::string())));
 }
 
 void EmbeddedWorkerTestHelper::SimulatePausedAfterDownload(
@@ -161,20 +158,28 @@ void EmbeddedWorkerTestHelper::SimulatePausedAfterDownload(
   registry()->OnPausedAfterDownload(worker->process_id(), embedded_worker_id);
 }
 
+void EmbeddedWorkerTestHelper::SimulateWorkerReadyForInspection(
+    int embedded_worker_id) {
+  EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
+  ASSERT_TRUE(worker != NULL);
+  registry()->OnWorkerReadyForInspection(worker->process_id(),
+                                         embedded_worker_id);
+}
+
 void EmbeddedWorkerTestHelper::SimulateWorkerScriptLoaded(
-      int embedded_worker_id) {
+    int thread_id, int embedded_worker_id) {
   EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
   ASSERT_TRUE(worker != NULL);
-  registry()->OnWorkerScriptLoaded(worker->process_id(), embedded_worker_id);
+  registry()->OnWorkerScriptLoaded(
+      worker->process_id(), thread_id, embedded_worker_id);
 }
 
 void EmbeddedWorkerTestHelper::SimulateWorkerStarted(
-    int thread_id, int embedded_worker_id) {
+    int embedded_worker_id) {
   EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
   ASSERT_TRUE(worker != NULL);
   registry()->OnWorkerStarted(
       worker->process_id(),
-      thread_id,
       embedded_worker_id);
 }