Add ServiceWorker support in EmbeddedWorkerDevToolsManager.

content/browser/devtools/embedded_worker_devtools_manager.h

 // Copyright 2014 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.
 
 #ifndef CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
 #define CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_
 
 #include "base/basictypes.h"
 #include "base/containers/scoped_ptr_hash_map.h"
+#include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/strings/string16.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
 #include "content/common/content_export.h"
 
 class GURL;
 
 namespace content {
@@ skipping 10 matching lines @@
   // Returns the EmbeddedWorkerDevToolsManager singleton.
   static EmbeddedWorkerDevToolsManager* GetInstance();
 
   DevToolsAgentHost* GetDevToolsAgentHostForWorker(int worker_process_id,
                                                    int worker_route_id);
 
   // Returns true when the worker must be paused on start.
   bool SharedWorkerCreated(int worker_process_id,
                            int worker_route_id,
                            const SharedWorkerInstance& instance);
+  bool ServiceWorkerCreated(int worker_process_id,
+                            int worker_route_id,
+                            const base::FilePath& path,
+                            const GURL& scope);
+  void WorkerContextStarted(int worker_process_id, int worker_route_id);
   void WorkerDestroyed(int worker_process_id, int worker_route_id);
-  void WorkerContextStarted(int worker_process_id, int worker_route_id);
 
  private:
   friend struct DefaultSingletonTraits<EmbeddedWorkerDevToolsManager>;
   friend class EmbeddedWorkerDevToolsManagerTest;
   FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, BasicTest);
   FRIEND_TEST_ALL_PREFIXES(EmbeddedWorkerDevToolsManagerTest, AttachTest);
 
   enum WorkerState {
     WORKER_UNINSPECTED,
     WORKER_INSPECTED,
     WORKER_TERMINATED,
     WORKER_PAUSED,
   };
 
   class WorkerInfo {
    public:
-    explicit WorkerInfo(const SharedWorkerInstance& instance)
-        : instance_(instance), state_(WORKER_UNINSPECTED), agent_host_(NULL) {}
+    explicit WorkerInfo(const SharedWorkerInstance& instance);
+    WorkerInfo(const base::FilePath& service_worker_path,
+               const GURL& service_worker_scope);
+    ~WorkerInfo();
 
-    const SharedWorkerInstance& instance() const { return instance_; }
     WorkerState state() { return state_; }
     void set_state(WorkerState new_state) { state_ = new_state; }
     EmbeddedWorkerDevToolsAgentHost* agent_host() { return agent_host_; }
     void set_agent_host(EmbeddedWorkerDevToolsAgentHost* agent_host) {
       agent_host_ = agent_host;
     }
+    bool Matches(const SharedWorkerInstance& other) {
+      if (!shared_worker_instance_)
+        return false;
+      return shared_worker_instance_->Matches(other);
+    }
+    bool Matches(const base::FilePath& other_service_worker_path,

[yurys, 2014/05/02 04:35:35]

nit: move implementation of Matches methods to the .cc file

[horo, 2014/05/02 06:31:55]

Done.

+                 const GURL& other_service_worker_scope) {
+      if (!service_worker_path_ || !service_worker_scope_)
+        return false;
+      return *service_worker_path_ == other_service_worker_path &&
+             *service_worker_scope_ == other_service_worker_scope;
+    }
 
    private:
-    const SharedWorkerInstance instance_;
+    scoped_ptr<SharedWorkerInstance> shared_worker_instance_;
+    scoped_ptr<base::FilePath> service_worker_path_;
+    scoped_ptr<GURL> service_worker_scope_;
     WorkerState state_;
     EmbeddedWorkerDevToolsAgentHost* agent_host_;
   };
 
   typedef base::ScopedPtrHashMap<WorkerId, WorkerInfo> WorkerInfoMap;
 
   EmbeddedWorkerDevToolsManager();
   virtual ~EmbeddedWorkerDevToolsManager();
 
   void RemoveInspectedWorkerData(EmbeddedWorkerDevToolsAgentHost* agent_host);
 
   WorkerInfoMap::iterator FindExistingSharedWorkerInfo(
       const SharedWorkerInstance& instance);
+  WorkerInfoMap::iterator FindExistingServiceWorkerInfo(
+      const base::FilePath& service_worker_path,
+      const GURL& service_worker_scope);
 
   // Resets to its initial state as if newly created.
   void ResetForTesting();
 
   WorkerInfoMap workers_;
 
   DISALLOW_COPY_AND_ASSIGN(EmbeddedWorkerDevToolsManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DEVTOOLS_EMBEDDED_WORKER_DEVTOOLS_MANAGER_H_