Index: content/browser/service_worker/embedded_worker_test_helper.h |
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h |
index af95f675fb02ca4943e834c06894c4b4a75b8ee8..2e9026d0b8a46b40474fcf2b26481949034e7f87 100644 |
--- a/content/browser/service_worker/embedded_worker_test_helper.h |
+++ b/content/browser/service_worker/embedded_worker_test_helper.h |
@@ -7,7 +7,9 @@ |
#include <vector> |
+#include "base/atomic_sequence_num.h" |
#include "base/callback.h" |
+#include "base/memory/ref_counted.h" |
#include "base/memory/weak_ptr.h" |
#include "ipc/ipc_listener.h" |
#include "ipc/ipc_test_sink.h" |
@@ -99,10 +101,22 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
EmbeddedWorkerRegistry* registry(); |
private: |
+ class NextRoutingId : public base::RefCountedThreadSafe<NextRoutingId> { |
+ public: |
+ NextRoutingId() {} |
+ int GetNext() { return atomic_sequence_number_.GetNext(); } |
+ |
+ private: |
+ friend class base::RefCountedThreadSafe<NextRoutingId>; |
+ ~NextRoutingId() {} |
+ base::AtomicSequenceNumber atomic_sequence_number_; |
+ }; |
+ |
void OnStartWorkerStub(int embedded_worker_id, |
int64 service_worker_version_id, |
const GURL& scope, |
- const GURL& script_url); |
+ const GURL& script_url, |
+ int worker_devtools_agent_route_id); |
void OnStopWorkerStub(int embedded_worker_id); |
void OnMessageToWorkerStub(int thread_id, |
int embedded_worker_id, |
@@ -122,6 +136,8 @@ class EmbeddedWorkerTestHelper : public IPC::Sender, |
// Updated each time MessageToWorker message is received. |
int current_embedded_worker_id_; |
+ scoped_refptr<NextRoutingId> next_routing_id_; |
+ |
base::WeakPtrFactory<EmbeddedWorkerTestHelper> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerTestHelper); |