Index: content/browser/service_worker/embedded_worker_instance.h |
diff --git a/content/browser/service_worker/embedded_worker_instance.h b/content/browser/service_worker/embedded_worker_instance.h |
index 5993a40c93fd20fdf5aa85f8c356ab40596029dc..8c5886cefe75eb0a2546e09e2d64f33c540dea84 100644 |
--- a/content/browser/service_worker/embedded_worker_instance.h |
+++ b/content/browser/service_worker/embedded_worker_instance.h |
@@ -19,6 +19,7 @@ |
#include "base/strings/string16.h" |
#include "base/time/time.h" |
#include "content/common/content_export.h" |
+#include "content/common/service_worker/embedded_worker.mojom.h" |
#include "content/common/service_worker/service_worker_status_code.h" |
#include "url/gurl.h" |
@@ -27,8 +28,6 @@ |
#undef SendMessage |
#endif |
-struct EmbeddedWorkerMsg_StartWorker_Params; |
- |
namespace IPC { |
class Message; |
} |
@@ -163,19 +162,19 @@ class CONTENT_EXPORT EmbeddedWorkerInstance { |
static void RunProcessAllocated( |
base::WeakPtr<EmbeddedWorkerInstance> instance, |
base::WeakPtr<ServiceWorkerContextCore> context, |
- scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params, |
+ EmbeddedWorkerStartWorkerParamsPtr params, |
const EmbeddedWorkerInstance::StatusCallback& callback, |
ServiceWorkerStatusCode status, |
int process_id, |
bool is_new_process); |
- void ProcessAllocated(scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params, |
+ void ProcessAllocated(EmbeddedWorkerStartWorkerParamsPtr params, |
const StatusCallback& callback, |
int process_id, |
bool is_new_process, |
ServiceWorkerStatusCode status); |
// Called back after ProcessAllocated() passes control to the UI thread to |
// register to WorkerDevToolsManager. |
- void SendStartWorker(scoped_ptr<EmbeddedWorkerMsg_StartWorker_Params> params, |
+ void SendStartWorker(EmbeddedWorkerStartWorkerParamsPtr params, |
const StatusCallback& callback, |
bool is_new_process, |
int worker_devtools_agent_route_id, |
@@ -242,6 +241,7 @@ class CONTENT_EXPORT EmbeddedWorkerInstance { |
int process_id_; |
int thread_id_; |
scoped_ptr<ServiceRegistryImpl> service_registry_; |
+ EmbeddedWorkerPtr worker_; |
// Whether devtools is attached or not. |
bool devtools_attached_; |