| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/browser/devtools/embedded_worker_devtools_manager.h" | 5 #include "content/browser/devtools/embedded_worker_devtools_manager.h" |
| 6 | 6 |
| 7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "content/browser/browser_thread_impl.h" | 10 #include "content/browser/browser_thread_impl.h" |
| 11 #include "content/browser/devtools/devtools_manager_impl.h" | 11 #include "content/browser/devtools/devtools_agent_host_impl.h" |
| 12 #include "content/browser/shared_worker/shared_worker_instance.h" | 12 #include "content/browser/shared_worker/shared_worker_instance.h" |
| 13 #include "content/browser/shared_worker/worker_storage_partition.h" | 13 #include "content/browser/shared_worker/worker_storage_partition.h" |
| 14 #include "content/public/browser/devtools_agent_host.h" | |
| 15 #include "content/public/browser/devtools_client_host.h" | |
| 16 #include "content/public/test/test_browser_context.h" | 14 #include "content/public/test/test_browser_context.h" |
| 17 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 18 | 16 |
| 19 namespace content { | 17 namespace content { |
| 20 namespace { | 18 namespace { |
| 21 | 19 |
| 22 class TestDevToolsClientHost : public DevToolsClientHost { | 20 class TestDevToolsClientHost : public DevToolsAgentHost::Client { |
| 23 public: | 21 public: |
| 24 TestDevToolsClientHost() {} | 22 TestDevToolsClientHost() {} |
| 25 virtual ~TestDevToolsClientHost() {} | 23 virtual ~TestDevToolsClientHost() {} |
| 26 virtual void DispatchOnInspectorFrontend( | 24 virtual void SendMessageFromAgentHost( |
| 27 const std::string& message) OVERRIDE {} | 25 DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {} |
| 28 virtual void InspectedContentsClosing() OVERRIDE {} | 26 virtual void AgentHostDetached( |
| 29 virtual void ReplacedWithAnotherClient() OVERRIDE {} | 27 DevToolsAgentHost* agent_host, |
| 28 DevToolsAgentHost::DetachReason reason) OVERRIDE {} |
| 30 | 29 |
| 30 void InspectAgentHost(DevToolsAgentHost* agent_host) { |
| 31 if (agent_host_) |
| 32 agent_host_->DetachClient(); |
| 33 agent_host_ = agent_host; |
| 34 if (agent_host_) |
| 35 agent_host_->AttachClient(this); |
| 36 } |
| 31 private: | 37 private: |
| 38 scoped_refptr<DevToolsAgentHost> agent_host_; |
| 32 DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost); | 39 DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost); |
| 33 }; | 40 }; |
| 34 } | 41 } |
| 35 | 42 |
| 36 class EmbeddedWorkerDevToolsManagerTest : public testing::Test { | 43 class EmbeddedWorkerDevToolsManagerTest : public testing::Test { |
| 37 public: | 44 public: |
| 38 EmbeddedWorkerDevToolsManagerTest() | 45 EmbeddedWorkerDevToolsManagerTest() |
| 39 : ui_thread_(BrowserThread::UI, &message_loop_), | 46 : ui_thread_(BrowserThread::UI, &message_loop_), |
| 40 browser_context_(new TestBrowserContext()), | 47 browser_context_(new TestBrowserContext()), |
| 41 partition_( | 48 partition_( |
| (...skipping 29 matching lines...) Expand all Loading... |
| 71 void CheckWorkerNotExist(int worker_process_id, int worker_route_id) { | 78 void CheckWorkerNotExist(int worker_process_id, int worker_route_id) { |
| 72 const EmbeddedWorkerDevToolsManager::WorkerId id(worker_process_id, | 79 const EmbeddedWorkerDevToolsManager::WorkerId id(worker_process_id, |
| 73 worker_route_id); | 80 worker_route_id); |
| 74 EXPECT_TRUE(manager_->workers_.end() == manager_->workers_.find(id)); | 81 EXPECT_TRUE(manager_->workers_.end() == manager_->workers_.find(id)); |
| 75 } | 82 } |
| 76 | 83 |
| 77 void CheckWorkerCount(size_t size) { | 84 void CheckWorkerCount(size_t size) { |
| 78 EXPECT_EQ(size, manager_->workers_.size()); | 85 EXPECT_EQ(size, manager_->workers_.size()); |
| 79 } | 86 } |
| 80 | 87 |
| 81 void RegisterDevToolsClientHostFor(DevToolsAgentHost* agent_host, | |
| 82 DevToolsClientHost* client_host) { | |
| 83 DevToolsManagerImpl::GetInstance()->RegisterDevToolsClientHostFor( | |
| 84 agent_host, client_host); | |
| 85 } | |
| 86 | |
| 87 void ClientHostClosing(DevToolsClientHost* client_host) { | |
| 88 DevToolsManagerImpl::GetInstance()->ClientHostClosing(client_host); | |
| 89 } | |
| 90 | |
| 91 base::MessageLoopForIO message_loop_; | 88 base::MessageLoopForIO message_loop_; |
| 92 BrowserThreadImpl ui_thread_; | 89 BrowserThreadImpl ui_thread_; |
| 93 scoped_ptr<TestBrowserContext> browser_context_; | 90 scoped_ptr<TestBrowserContext> browser_context_; |
| 94 scoped_ptr<WorkerStoragePartition> partition_; | 91 scoped_ptr<WorkerStoragePartition> partition_; |
| 95 const WorkerStoragePartitionId partition_id_; | 92 const WorkerStoragePartitionId partition_id_; |
| 96 EmbeddedWorkerDevToolsManager* manager_; | 93 EmbeddedWorkerDevToolsManager* manager_; |
| 97 }; | 94 }; |
| 98 | 95 |
| 99 TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) { | 96 TEST_F(EmbeddedWorkerDevToolsManagerTest, BasicTest) { |
| 100 scoped_refptr<DevToolsAgentHost> agent_host; | 97 scoped_refptr<DevToolsAgentHostImpl> agent_host; |
| 101 | 98 |
| 102 SharedWorkerInstance instance1(GURL("http://example.com/w.js"), | 99 SharedWorkerInstance instance1(GURL("http://example.com/w.js"), |
| 103 base::string16(), | 100 base::string16(), |
| 104 base::string16(), | 101 base::string16(), |
| 105 blink::WebContentSecurityPolicyTypeReport, | 102 blink::WebContentSecurityPolicyTypeReport, |
| 106 browser_context_->GetResourceContext(), | 103 browser_context_->GetResourceContext(), |
| 107 partition_id_); | 104 partition_id_); |
| 108 | 105 |
| 109 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 1); | 106 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 1); |
| 110 EXPECT_FALSE(agent_host.get()); | 107 EXPECT_FALSE(agent_host.get()); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 172 CheckWorkerState(1, 6, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); | 169 CheckWorkerState(1, 6, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); |
| 173 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 6); | 170 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 6); |
| 174 EXPECT_TRUE(agent_host.get()); | 171 EXPECT_TRUE(agent_host.get()); |
| 175 CheckWorkerState(1, 6, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 172 CheckWorkerState(1, 6, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 176 agent_host = NULL; | 173 agent_host = NULL; |
| 177 manager_->WorkerDestroyed(1, 6); | 174 manager_->WorkerDestroyed(1, 6); |
| 178 CheckWorkerNotExist(1, 6); | 175 CheckWorkerNotExist(1, 6); |
| 179 } | 176 } |
| 180 | 177 |
| 181 TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) { | 178 TEST_F(EmbeddedWorkerDevToolsManagerTest, AttachTest) { |
| 182 scoped_refptr<DevToolsAgentHost> agent_host1; | 179 scoped_refptr<DevToolsAgentHostImpl> agent_host1; |
| 183 scoped_refptr<DevToolsAgentHost> agent_host2; | 180 scoped_refptr<DevToolsAgentHostImpl> agent_host2; |
| 184 | 181 |
| 185 SharedWorkerInstance instance1(GURL("http://example.com/w1.js"), | 182 SharedWorkerInstance instance1(GURL("http://example.com/w1.js"), |
| 186 base::string16(), | 183 base::string16(), |
| 187 base::string16(), | 184 base::string16(), |
| 188 blink::WebContentSecurityPolicyTypeReport, | 185 blink::WebContentSecurityPolicyTypeReport, |
| 189 browser_context_->GetResourceContext(), | 186 browser_context_->GetResourceContext(), |
| 190 partition_id_); | 187 partition_id_); |
| 191 SharedWorkerInstance instance2(GURL("http://example.com/w2.js"), | 188 SharedWorkerInstance instance2(GURL("http://example.com/w2.js"), |
| 192 base::string16(), | 189 base::string16(), |
| 193 base::string16(), | 190 base::string16(), |
| 194 blink::WebContentSecurityPolicyTypeReport, | 191 blink::WebContentSecurityPolicyTypeReport, |
| 195 browser_context_->GetResourceContext(), | 192 browser_context_->GetResourceContext(), |
| 196 partition_id_); | 193 partition_id_); |
| 197 | 194 |
| 198 // Created -> GetDevToolsAgentHost -> Register -> Started -> Destroyed | 195 // Created -> GetDevToolsAgentHost -> Register -> Started -> Destroyed |
| 199 scoped_ptr<TestDevToolsClientHost> client_host1(new TestDevToolsClientHost()); | 196 scoped_ptr<TestDevToolsClientHost> client_host1(new TestDevToolsClientHost()); |
| 200 CheckWorkerNotExist(2, 1); | 197 CheckWorkerNotExist(2, 1); |
| 201 manager_->SharedWorkerCreated(2, 1, instance1); | 198 manager_->SharedWorkerCreated(2, 1, instance1); |
| 202 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); | 199 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); |
| 203 agent_host1 = manager_->GetDevToolsAgentHostForWorker(2, 1); | 200 agent_host1 = manager_->GetDevToolsAgentHostForWorker(2, 1); |
| 204 EXPECT_TRUE(agent_host1.get()); | 201 EXPECT_TRUE(agent_host1.get()); |
| 205 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 202 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 206 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1)); | 203 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1)); |
| 207 RegisterDevToolsClientHostFor(agent_host1.get(), client_host1.get()); | 204 client_host1->InspectAgentHost(agent_host1.get()); |
| 208 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 205 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 209 manager_->WorkerContextStarted(2, 1); | 206 manager_->WorkerContextStarted(2, 1); |
| 210 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 207 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 211 manager_->WorkerDestroyed(2, 1); | 208 manager_->WorkerDestroyed(2, 1); |
| 212 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); | 209 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); |
| 213 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1)); | 210 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1)); |
| 214 | 211 |
| 215 // Created -> Started -> GetDevToolsAgentHost -> Register -> Destroyed | 212 // Created -> Started -> GetDevToolsAgentHost -> Register -> Destroyed |
| 216 scoped_ptr<TestDevToolsClientHost> client_host2(new TestDevToolsClientHost()); | 213 scoped_ptr<TestDevToolsClientHost> client_host2(new TestDevToolsClientHost()); |
| 217 manager_->SharedWorkerCreated(2, 2, instance2); | 214 manager_->SharedWorkerCreated(2, 2, instance2); |
| 218 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); | 215 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); |
| 219 manager_->WorkerContextStarted(2, 2); | 216 manager_->WorkerContextStarted(2, 2); |
| 220 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); | 217 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_UNINSPECTED); |
| 221 agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2); | 218 agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2); |
| 222 EXPECT_TRUE(agent_host2.get()); | 219 EXPECT_TRUE(agent_host2.get()); |
| 223 EXPECT_NE(agent_host1.get(), agent_host2.get()); | 220 EXPECT_NE(agent_host1.get(), agent_host2.get()); |
| 224 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2)); | 221 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2)); |
| 225 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 222 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 226 RegisterDevToolsClientHostFor(agent_host2.get(), client_host2.get()); | 223 client_host2->InspectAgentHost(agent_host2); |
| 227 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 224 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 228 manager_->WorkerDestroyed(2, 2); | 225 manager_->WorkerDestroyed(2, 2); |
| 229 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); | 226 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); |
| 230 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2)); | 227 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2)); |
| 231 | 228 |
| 232 // Re-created -> Started -> ClientHostClosing -> Destroyed | 229 // Re-created -> Started -> ClientHostClosing -> Destroyed |
| 233 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); | 230 CheckWorkerState(2, 1, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); |
| 234 manager_->SharedWorkerCreated(2, 3, instance1); | 231 manager_->SharedWorkerCreated(2, 3, instance1); |
| 235 CheckWorkerNotExist(2, 1); | 232 CheckWorkerNotExist(2, 1); |
| 236 CheckWorkerState( | 233 CheckWorkerState( |
| 237 2, 3, EmbeddedWorkerDevToolsManager::WORKER_PAUSED_FOR_REATTACH); | 234 2, 3, EmbeddedWorkerDevToolsManager::WORKER_PAUSED_FOR_REATTACH); |
| 238 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3)); | 235 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3)); |
| 239 manager_->WorkerContextStarted(2, 3); | 236 manager_->WorkerContextStarted(2, 3); |
| 240 CheckWorkerState(2, 3, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); | 237 CheckWorkerState(2, 3, EmbeddedWorkerDevToolsManager::WORKER_INSPECTED); |
| 241 ClientHostClosing(client_host1.get()); | 238 client_host1->InspectAgentHost(NULL); |
| 242 manager_->WorkerDestroyed(2, 3); | 239 manager_->WorkerDestroyed(2, 3); |
| 243 CheckWorkerState(2, 3, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); | 240 CheckWorkerState(2, 3, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); |
| 244 agent_host1 = NULL; | 241 agent_host1 = NULL; |
| 245 CheckWorkerNotExist(2, 3); | 242 CheckWorkerNotExist(2, 3); |
| 246 | 243 |
| 247 // Re-created -> Destroyed | 244 // Re-created -> Destroyed |
| 248 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); | 245 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); |
| 249 manager_->SharedWorkerCreated(2, 4, instance2); | 246 manager_->SharedWorkerCreated(2, 4, instance2); |
| 250 CheckWorkerNotExist(2, 2); | 247 CheckWorkerNotExist(2, 2); |
| 251 CheckWorkerState( | 248 CheckWorkerState( |
| 252 2, 4, EmbeddedWorkerDevToolsManager::WORKER_PAUSED_FOR_REATTACH); | 249 2, 4, EmbeddedWorkerDevToolsManager::WORKER_PAUSED_FOR_REATTACH); |
| 253 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 4)); | 250 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 4)); |
| 254 manager_->WorkerDestroyed(2, 4); | 251 manager_->WorkerDestroyed(2, 4); |
| 255 CheckWorkerNotExist(2, 4); | 252 CheckWorkerNotExist(2, 4); |
| 256 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); | 253 CheckWorkerState(2, 2, EmbeddedWorkerDevToolsManager::WORKER_TERMINATED); |
| 257 | 254 |
| 258 // Re-created -> ClientHostClosing -> Destroyed | 255 // Re-created -> ClientHostClosing -> Destroyed |
| 259 manager_->SharedWorkerCreated(2, 5, instance2); | 256 manager_->SharedWorkerCreated(2, 5, instance2); |
| 260 CheckWorkerNotExist(2, 2); | 257 CheckWorkerNotExist(2, 2); |
| 261 CheckWorkerState( | 258 CheckWorkerState( |
| 262 2, 5, EmbeddedWorkerDevToolsManager::WORKER_PAUSED_FOR_REATTACH); | 259 2, 5, EmbeddedWorkerDevToolsManager::WORKER_PAUSED_FOR_REATTACH); |
| 263 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 5)); | 260 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 5)); |
| 264 ClientHostClosing(client_host2.get()); | 261 client_host2->InspectAgentHost(NULL); |
| 265 CheckWorkerCount(1); | 262 CheckWorkerCount(1); |
| 266 agent_host2 = NULL; | 263 agent_host2 = NULL; |
| 267 CheckWorkerCount(1); | 264 CheckWorkerCount(1); |
| 268 manager_->WorkerDestroyed(2, 5); | 265 manager_->WorkerDestroyed(2, 5); |
| 269 CheckWorkerCount(0); | 266 CheckWorkerCount(0); |
| 270 } | 267 } |
| 271 | 268 |
| 272 } // namespace content | 269 } // namespace content |
| OLD | NEW |