Update To 11.40.268.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 bfc57bc..abc0c2b 100644 (file)
--- a/src/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/src/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -23,10 +23,14 @@ EmbeddedWorkerTestHelper::EmbeddedWorkerTestHelper(int mock_render_process_id)
       next_thread_id_(0),
       mock_render_process_id_(mock_render_process_id),
       weak_factory_(this) {
+  scoped_ptr<MockServiceWorkerDatabaseTaskManager> database_task_manager(
+      new MockServiceWorkerDatabaseTaskManager(
+          base::MessageLoopProxy::current()));
   wrapper_->InitInternal(base::FilePath(),
                          base::MessageLoopProxy::current(),
+                         database_task_manager.Pass(),
                          base::MessageLoopProxy::current(),
-                         base::MessageLoopProxy::current(),
+                         NULL,
                          NULL);
   wrapper_->process_manager()->SetProcessIdForTest(mock_render_process_id);
   registry()->AddChildProcessSender(mock_render_process_id, this);
@@ -91,12 +95,14 @@ void EmbeddedWorkerTestHelper::OnStartWorker(
   }
   SimulateWorkerReadyForInspection(embedded_worker_id);
   SimulateWorkerScriptLoaded(next_thread_id_++, embedded_worker_id);
+  SimulateWorkerScriptEvaluated(embedded_worker_id);
   SimulateWorkerStarted(embedded_worker_id);
 }
 
 void EmbeddedWorkerTestHelper::OnResumeAfterDownload(int embedded_worker_id) {
   SimulateWorkerReadyForInspection(embedded_worker_id);
   SimulateWorkerScriptLoaded(next_thread_id_++, embedded_worker_id);
+  SimulateWorkerScriptEvaluated(embedded_worker_id);
   SimulateWorkerStarted(embedded_worker_id);
 }
 
@@ -147,8 +153,13 @@ void EmbeddedWorkerTestHelper::OnFetchEvent(
       embedded_worker_id,
       request_id,
       SERVICE_WORKER_FETCH_EVENT_RESULT_RESPONSE,
-      ServiceWorkerResponse(
-          GURL(""), 200, "OK", ServiceWorkerHeaderMap(), std::string())));
+      ServiceWorkerResponse(GURL(""),
+                            200,
+                            "OK",
+                            blink::WebServiceWorkerResponseTypeDefault,
+                            ServiceWorkerHeaderMap(),
+                            std::string(),
+                            0)));
 }
 
 void EmbeddedWorkerTestHelper::SimulatePausedAfterDownload(
@@ -174,6 +185,14 @@ void EmbeddedWorkerTestHelper::SimulateWorkerScriptLoaded(
       worker->process_id(), thread_id, embedded_worker_id);
 }
 
+void EmbeddedWorkerTestHelper::SimulateWorkerScriptEvaluated(
+    int embedded_worker_id) {
+  EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);
+  ASSERT_TRUE(worker != NULL);
+  registry()->OnWorkerScriptEvaluated(
+      worker->process_id(), embedded_worker_id, true /* success */);
+}
+
 void EmbeddedWorkerTestHelper::SimulateWorkerStarted(
     int embedded_worker_id) {
   EmbeddedWorkerInstance* worker = registry()->GetWorker(embedded_worker_id);