Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(432)

Side by Side Diff: content/browser/devtools/embedded_worker_devtools_manager_unittest.cc

Issue 661423002: DevTools: Clean-up service/shared workers code after switching to main thread debugging. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed some more code Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 1); 108 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 1);
109 EXPECT_FALSE(agent_host.get()); 109 EXPECT_FALSE(agent_host.get());
110 110
111 // Created -> Started -> Destroyed 111 // Created -> Started -> Destroyed
112 CheckWorkerNotExist(1, 1); 112 CheckWorkerNotExist(1, 1);
113 manager_->SharedWorkerCreated(1, 1, instance1); 113 manager_->SharedWorkerCreated(1, 1, instance1);
114 CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED); 114 CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
115 manager_->WorkerReadyForInspection(1, 1); 115 manager_->WorkerReadyForInspection(1, 1);
116 CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED); 116 CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
117 manager_->WorkerContextStarted(1, 1);
118 CheckWorkerState(1, 1, WorkerState::WORKER_UNINSPECTED);
119 manager_->WorkerDestroyed(1, 1); 117 manager_->WorkerDestroyed(1, 1);
120 CheckWorkerNotExist(1, 1); 118 CheckWorkerNotExist(1, 1);
121 119
122 // Created -> GetDevToolsAgentHost -> Started -> Destroyed 120 // Created -> GetDevToolsAgentHost -> Started -> Destroyed
123 CheckWorkerNotExist(1, 2); 121 CheckWorkerNotExist(1, 2);
124 manager_->SharedWorkerCreated(1, 2, instance1); 122 manager_->SharedWorkerCreated(1, 2, instance1);
125 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED); 123 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
126 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 2); 124 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 2);
127 EXPECT_TRUE(agent_host.get()); 125 EXPECT_TRUE(agent_host.get());
128 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED); 126 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
129 EXPECT_EQ(agent_host.get(), manager_->GetDevToolsAgentHostForWorker(1, 2)); 127 EXPECT_EQ(agent_host.get(), manager_->GetDevToolsAgentHostForWorker(1, 2));
130 manager_->WorkerReadyForInspection(1, 2); 128 manager_->WorkerReadyForInspection(1, 2);
131 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED); 129 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
132 manager_->WorkerContextStarted(1, 2);
133 CheckWorkerState(1, 2, WorkerState::WORKER_UNINSPECTED);
134 manager_->WorkerDestroyed(1, 2); 130 manager_->WorkerDestroyed(1, 2);
135 CheckWorkerState(1, 2, WorkerState::WORKER_TERMINATED); 131 CheckWorkerState(1, 2, WorkerState::WORKER_TERMINATED);
136 agent_host = NULL; 132 agent_host = NULL;
137 CheckWorkerNotExist(1, 2); 133 CheckWorkerNotExist(1, 2);
138 134
139 // Created -> Started -> GetDevToolsAgentHost -> Destroyed 135 // Created -> Started -> GetDevToolsAgentHost -> Destroyed
140 CheckWorkerNotExist(1, 3); 136 CheckWorkerNotExist(1, 3);
141 manager_->SharedWorkerCreated(1, 3, instance1); 137 manager_->SharedWorkerCreated(1, 3, instance1);
142 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED); 138 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
143 manager_->WorkerReadyForInspection(1, 3); 139 manager_->WorkerReadyForInspection(1, 3);
144 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED); 140 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
145 manager_->WorkerContextStarted(1, 3);
146 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
147 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 3); 141 agent_host = manager_->GetDevToolsAgentHostForWorker(1, 3);
148 EXPECT_TRUE(agent_host.get()); 142 EXPECT_TRUE(agent_host.get());
149 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED); 143 CheckWorkerState(1, 3, WorkerState::WORKER_UNINSPECTED);
150 manager_->WorkerDestroyed(1, 3); 144 manager_->WorkerDestroyed(1, 3);
151 CheckWorkerState(1, 3, WorkerState::WORKER_TERMINATED); 145 CheckWorkerState(1, 3, WorkerState::WORKER_TERMINATED);
152 agent_host = NULL; 146 agent_host = NULL;
153 CheckWorkerNotExist(1, 3); 147 CheckWorkerNotExist(1, 3);
154 148
155 // Created -> Destroyed 149 // Created -> Destroyed
156 CheckWorkerNotExist(1, 4); 150 CheckWorkerNotExist(1, 4);
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 manager_->SharedWorkerCreated(2, 1, instance1); 200 manager_->SharedWorkerCreated(2, 1, instance1);
207 CheckWorkerState(2, 1, WorkerState::WORKER_UNINSPECTED); 201 CheckWorkerState(2, 1, WorkerState::WORKER_UNINSPECTED);
208 agent_host1 = manager_->GetDevToolsAgentHostForWorker(2, 1); 202 agent_host1 = manager_->GetDevToolsAgentHostForWorker(2, 1);
209 EXPECT_TRUE(agent_host1.get()); 203 EXPECT_TRUE(agent_host1.get());
210 CheckWorkerState(2, 1, WorkerState::WORKER_UNINSPECTED); 204 CheckWorkerState(2, 1, WorkerState::WORKER_UNINSPECTED);
211 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1)); 205 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
212 client_host1->InspectAgentHost(agent_host1.get()); 206 client_host1->InspectAgentHost(agent_host1.get());
213 CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED); 207 CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
214 manager_->WorkerReadyForInspection(2, 1); 208 manager_->WorkerReadyForInspection(2, 1);
215 CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED); 209 CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
216 manager_->WorkerContextStarted(2, 1);
217 CheckWorkerState(2, 1, WorkerState::WORKER_INSPECTED);
218 manager_->WorkerDestroyed(2, 1); 210 manager_->WorkerDestroyed(2, 1);
219 CheckWorkerState(2, 1, WorkerState::WORKER_TERMINATED); 211 CheckWorkerState(2, 1, WorkerState::WORKER_TERMINATED);
220 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1)); 212 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 1));
221 213
222 // Created -> Started -> GetDevToolsAgentHost -> Register -> Destroyed 214 // Created -> Started -> GetDevToolsAgentHost -> Register -> Destroyed
223 scoped_ptr<TestDevToolsClientHost> client_host2(new TestDevToolsClientHost()); 215 scoped_ptr<TestDevToolsClientHost> client_host2(new TestDevToolsClientHost());
224 manager_->SharedWorkerCreated(2, 2, instance2); 216 manager_->SharedWorkerCreated(2, 2, instance2);
225 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED); 217 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
226 manager_->WorkerReadyForInspection(2, 2); 218 manager_->WorkerReadyForInspection(2, 2);
227 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED); 219 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
228 manager_->WorkerContextStarted(2, 2);
229 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
230 agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2); 220 agent_host2 = manager_->GetDevToolsAgentHostForWorker(2, 2);
231 EXPECT_TRUE(agent_host2.get()); 221 EXPECT_TRUE(agent_host2.get());
232 EXPECT_NE(agent_host1.get(), agent_host2.get()); 222 EXPECT_NE(agent_host1.get(), agent_host2.get());
233 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2)); 223 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2));
234 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED); 224 CheckWorkerState(2, 2, WorkerState::WORKER_UNINSPECTED);
235 client_host2->InspectAgentHost(agent_host2.get()); 225 client_host2->InspectAgentHost(agent_host2.get());
236 CheckWorkerState(2, 2, WorkerState::WORKER_INSPECTED); 226 CheckWorkerState(2, 2, WorkerState::WORKER_INSPECTED);
237 manager_->WorkerDestroyed(2, 2); 227 manager_->WorkerDestroyed(2, 2);
238 CheckWorkerState(2, 2, WorkerState::WORKER_TERMINATED); 228 CheckWorkerState(2, 2, WorkerState::WORKER_TERMINATED);
239 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2)); 229 EXPECT_EQ(agent_host2.get(), manager_->GetDevToolsAgentHostForWorker(2, 2));
240 230
241 // Re-created -> Started -> ClientHostClosing -> Destroyed 231 // Re-created -> Started -> ClientHostClosing -> Destroyed
242 CheckWorkerState(2, 1, WorkerState::WORKER_TERMINATED); 232 CheckWorkerState(2, 1, WorkerState::WORKER_TERMINATED);
243 manager_->SharedWorkerCreated(2, 3, instance1); 233 manager_->SharedWorkerCreated(2, 3, instance1);
244 CheckWorkerNotExist(2, 1); 234 CheckWorkerNotExist(2, 1);
245 CheckWorkerState(2, 3, WorkerState::WORKER_PAUSED_FOR_REATTACH); 235 CheckWorkerState(2, 3, WorkerState::WORKER_PAUSED_FOR_REATTACH);
246 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3)); 236 EXPECT_EQ(agent_host1.get(), manager_->GetDevToolsAgentHostForWorker(2, 3));
247 manager_->WorkerReadyForInspection(2, 3); 237 manager_->WorkerReadyForInspection(2, 3);
248 CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED); 238 CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED);
249 manager_->WorkerContextStarted(2, 3);
250 CheckWorkerState(2, 3, WorkerState::WORKER_INSPECTED);
251 client_host1->InspectAgentHost(NULL); 239 client_host1->InspectAgentHost(NULL);
252 manager_->WorkerDestroyed(2, 3); 240 manager_->WorkerDestroyed(2, 3);
253 CheckWorkerState(2, 3, WorkerState::WORKER_TERMINATED); 241 CheckWorkerState(2, 3, WorkerState::WORKER_TERMINATED);
254 agent_host1 = NULL; 242 agent_host1 = NULL;
255 CheckWorkerNotExist(2, 3); 243 CheckWorkerNotExist(2, 3);
256 244
257 // Re-created -> Destroyed 245 // Re-created -> Destroyed
258 CheckWorkerState(2, 2, WorkerState::WORKER_TERMINATED); 246 CheckWorkerState(2, 2, WorkerState::WORKER_TERMINATED);
259 manager_->SharedWorkerCreated(2, 4, instance2); 247 manager_->SharedWorkerCreated(2, 4, instance2);
260 CheckWorkerNotExist(2, 2); 248 CheckWorkerNotExist(2, 2);
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
302 manager_->SharedWorkerCreated(3, 2, instance); 290 manager_->SharedWorkerCreated(3, 2, instance);
303 CheckWorkerState(3, 2, WorkerState::WORKER_UNINSPECTED); 291 CheckWorkerState(3, 2, WorkerState::WORKER_UNINSPECTED);
304 agent_host = NULL; 292 agent_host = NULL;
305 CheckWorkerState(3, 2, WorkerState::WORKER_UNINSPECTED); 293 CheckWorkerState(3, 2, WorkerState::WORKER_UNINSPECTED);
306 manager_->WorkerDestroyed(3, 2); 294 manager_->WorkerDestroyed(3, 2);
307 CheckWorkerNotExist(3, 2); 295 CheckWorkerNotExist(3, 2);
308 CheckWorkerCount(0); 296 CheckWorkerCount(0);
309 } 297 }
310 298
311 } // namespace content 299 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698