diff options
| author | horo@chromium.org <horo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 08:54:02 +0000 |
|---|---|---|
| committer | horo@chromium.org <horo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-03 08:54:02 +0000 |
| commit | ab4d372e38ccfd13b5802a00d66e9552b93d9928 (patch) | |
| tree | 39e111056c0bd989f4ea16cab758c64269aba41a /content/browser/devtools/worker_devtools_manager.cc | |
| parent | 8370cc3f82216fabc914e609faaae11cf375ab94 (diff) | |
| download | chromium_src-ab4d372e38ccfd13b5802a00d66e9552b93d9928.zip chromium_src-ab4d372e38ccfd13b5802a00d66e9552b93d9928.tar.gz chromium_src-ab4d372e38ccfd13b5802a00d66e9552b93d9928.tar.bz2 | |
Revert of Make DevTools support for the embedded SharedWorker. (https://codereview.chromium.org/196503005/)
Reason for revert:
buildbot failure in Chromium Memory on Linux ASan+LSan Tests
SharedWorkerDevToolsManagerTest.AttachTest test causes memory leaks.
Original issue's description:
> Make DevTools support for the embedded SharedWorker.
>
> BUG=327256
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=261314
TBR=kinuko@chromium.org,pfeldman@chromium.org,yurys@chromium.org,sergeyv@chromium.org,jochen@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=327256
Review URL: https://codereview.chromium.org/223583002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/devtools/worker_devtools_manager.cc')
| -rw-r--r-- | content/browser/devtools/worker_devtools_manager.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/content/browser/devtools/worker_devtools_manager.cc b/content/browser/devtools/worker_devtools_manager.cc index a05a04a..62f77e7 100644 --- a/content/browser/devtools/worker_devtools_manager.cc +++ b/content/browser/devtools/worker_devtools_manager.cc @@ -13,7 +13,6 @@ #include "content/browser/devtools/devtools_protocol.h" #include "content/browser/devtools/devtools_protocol_constants.h" #include "content/browser/devtools/ipc_devtools_agent_host.h" -#include "content/browser/devtools/shared_worker_devtools_manager.h" #include "content/browser/devtools/worker_devtools_message_filter.h" #include "content/browser/worker_host/worker_service_impl.h" #include "content/common/devtools_messages.h" @@ -28,13 +27,9 @@ namespace content { scoped_refptr<DevToolsAgentHost> DevToolsAgentHost::GetForWorker( int worker_process_id, int worker_route_id) { - if (WorkerService::EmbeddedSharedWorkerEnabled()) { - return SharedWorkerDevToolsManager::GetInstance() - ->GetDevToolsAgentHostForWorker(worker_process_id, worker_route_id); - } else { - return WorkerDevToolsManager::GetDevToolsAgentHostForWorker( - worker_process_id, worker_route_id); - } + return WorkerDevToolsManager::GetDevToolsAgentHostForWorker( + worker_process_id, + worker_route_id); } namespace { @@ -212,7 +207,6 @@ struct WorkerDevToolsManager::InspectedWorker { // static WorkerDevToolsManager* WorkerDevToolsManager::GetInstance() { - DCHECK(!WorkerService::EmbeddedSharedWorkerEnabled()); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); return Singleton<WorkerDevToolsManager>::get(); } @@ -221,7 +215,6 @@ WorkerDevToolsManager* WorkerDevToolsManager::GetInstance() { DevToolsAgentHost* WorkerDevToolsManager::GetDevToolsAgentHostForWorker( int worker_process_id, int worker_route_id) { - DCHECK(!WorkerService::EmbeddedSharedWorkerEnabled()); WorkerId id(worker_process_id, worker_route_id); AgentHosts::iterator it = g_agent_map.Get().find(id); if (it == g_agent_map.Get().end()) |