Revert of Make DevTools support for the embedded SharedWorker.

content/browser/shared_worker/shared_worker_service_impl.cc

 // 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.
 
 #include "content/browser/shared_worker/shared_worker_service_impl.h"
 
 #include <algorithm>
 #include <iterator>
 #include <set>
 #include <vector>
 
-#include "content/browser/devtools/shared_worker_devtools_manager.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/shared_worker/shared_worker_host.h"
 #include "content/browser/shared_worker/shared_worker_instance.h"
 #include "content/browser/shared_worker/shared_worker_message_filter.h"
 #include "content/browser/worker_host/worker_document_set.h"
 #include "content/common/view_messages.h"
 #include "content/common/worker_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/worker_service_observer.h"
 
@@ skipping 32 matching lines @@
 }
 
 void UpdateWorkerDependency(const std::vector<int>& added_ids,
                             const std::vector<int>& removed_ids) {
   BrowserThread::PostTask(
       BrowserThread::UI,
       FROM_HERE,
       base::Bind(&UpdateWorkerDependencyOnUI, added_ids, removed_ids));
 }
 
-void WorkerCreatedResultCallbackOnIO(int worker_process_id,
-                                     int worker_route_id,
-                                     bool pause_on_start) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  SharedWorkerServiceImpl::GetInstance()->WorkerCreatedResultCallback(
-      worker_process_id, worker_route_id, pause_on_start);
-}
-
-void NotifyWorkerCreatedOnUI(int worker_process_id,
-                             int worker_route_id,
-                             const SharedWorkerInstance& instance) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  bool pause_on_start =
-      SharedWorkerDevToolsManager::GetInstance()->WorkerCreated(
-          worker_process_id, worker_route_id, instance);
-  BrowserThread::PostTask(BrowserThread::IO,
-                          FROM_HERE,
-                          base::Bind(&WorkerCreatedResultCallbackOnIO,
-                                     worker_process_id,
-                                     worker_route_id,
-                                     pause_on_start));
-}
-
 }  // namespace
 
 SharedWorkerServiceImpl* SharedWorkerServiceImpl::GetInstance() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   return Singleton<SharedWorkerServiceImpl>::get();
 }
 
 SharedWorkerServiceImpl::SharedWorkerServiceImpl()
     : update_worker_dependency_(UpdateWorkerDependency) {}
 
@@ skipping 49 matching lines @@
     const ViewHostMsg_CreateWorker_Params& params,
     int route_id,
     SharedWorkerMessageFilter* filter,
     ResourceContext* resource_context,
     const WorkerStoragePartition& partition,
     bool* url_mismatch) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   ScopedWorkerDependencyChecker checker(this);
   *url_mismatch = false;
   SharedWorkerHost* existing_host = FindSharedWorkerHost(
-      worker_hosts_, params.url, params.name, partition, resource_context);
+      params.url, params.name, partition, resource_context);
   if (existing_host) {
     if (params.url != existing_host->instance()->url()) {
       *url_mismatch = true;
       return;
     }
     if (existing_host->load_failed()) {
       filter->Send(new ViewMsg_WorkerScriptLoadFailed(route_id));
       return;
     }
     existing_host->AddFilter(filter, route_id);
     existing_host->worker_document_set()->Add(filter,
                                               params.document_id,
                                               filter->render_process_id(),
                                               params.render_frame_route_id);
     filter->Send(new ViewMsg_WorkerCreated(route_id));
     return;
   }
-  SharedWorkerHost* pending_host = FindSharedWorkerHost(pending_worker_hosts_,
-                                                        params.url,
-                                                        params.name,
-                                                        partition,
-                                                        resource_context);
-  if (pending_host) {
-    if (params.url != pending_host->instance()->url()) {
-      *url_mismatch = true;
-      return;
-    }
-    pending_host->AddFilter(filter, route_id);
-    pending_host->worker_document_set()->Add(filter,
-                                             params.document_id,
-                                             filter->render_process_id(),
-                                             params.render_frame_route_id);
-    return;
-  }
 
   scoped_ptr<SharedWorkerInstance> instance(new SharedWorkerInstance(
       params.url,
       params.name,
       params.content_security_policy,
       params.security_policy_type,
       resource_context,
       partition));
-  scoped_ptr<SharedWorkerHost> host(
-      new SharedWorkerHost(instance.release(), filter));
+  scoped_ptr<SharedWorkerHost> host(new SharedWorkerHost(instance.release()));
   host->AddFilter(filter, route_id);
   host->worker_document_set()->Add(filter,
                                    params.document_id,
                                    filter->render_process_id(),
                                    params.render_frame_route_id);
+
+  host->Init(filter);
   const int worker_route_id = host->worker_route_id();
-  // We need to call SharedWorkerDevToolsManager::WorkerCreated() on UI thread
-  // to know whether the worker should be paused on start or not.
-  // WorkerCreatedResultCallback() will be called with the result.
-  BrowserThread::PostTask(BrowserThread::UI,
-                          FROM_HERE,
-                          base::Bind(&NotifyWorkerCreatedOnUI,
-                                     filter->render_process_id(),
-                                     worker_route_id,
-                                     *host->instance()));
-  pending_worker_hosts_.set(
-      std::make_pair(filter->render_process_id(), worker_route_id),
-      host.Pass());
-}
+  worker_hosts_.set(std::make_pair(filter->render_process_id(),
+                                   worker_route_id),
+                    host.Pass());
 
-void SharedWorkerServiceImpl::WorkerCreatedResultCallback(int worker_process_id,
-                                                          int worker_route_id,
-                                                          bool pause_on_start) {
-  scoped_ptr<SharedWorkerHost> host = pending_worker_hosts_.take_and_erase(
-      std::make_pair(worker_process_id, worker_route_id));
-  const GURL url = host->instance()->url();
-  const base::string16 name = host->instance()->name();
-  host->Start(pause_on_start);
-  worker_hosts_.set(std::make_pair(worker_process_id, worker_route_id),
-                    host.Pass());
   FOR_EACH_OBSERVER(
-      WorkerServiceObserver,
-      observers_,
-      WorkerCreated(url, name, worker_process_id, worker_route_id));
+      WorkerServiceObserver, observers_,
+      WorkerCreated(params.url,
+                    params.name,
+                    filter->render_process_id(),
+                    worker_route_id));
 }
 
 void SharedWorkerServiceImpl::ForwardToWorker(
     const IPC::Message& message,
     SharedWorkerMessageFilter* filter) {
   for (WorkerHostMap::const_iterator iter = worker_hosts_.begin();
        iter != worker_hosts_.end();
        ++iter) {
     if (iter->second->FilterMessage(message, filter))
       return;
@@ skipping 93 matching lines @@
     SharedWorkerMessageFilter* filter) {
   ScopedWorkerDependencyChecker checker(this);
   std::vector<ProcessRouteIdPair> remove_list;
   for (WorkerHostMap::iterator iter = worker_hosts_.begin();
        iter != worker_hosts_.end();
        ++iter) {
     iter->second->FilterShutdown(filter);
     if (iter->first.first == filter->render_process_id())
       remove_list.push_back(iter->first);
   }
-  for (size_t i = 0; i < remove_list.size(); ++i) {
-    scoped_ptr<SharedWorkerHost> host =
-        worker_hosts_.take_and_erase(remove_list[i]);
-  }
-}
-
-void SharedWorkerServiceImpl::NotifyWorkerDestroyed(int worker_process_id,
-                                                    int worker_route_id) {
-  FOR_EACH_OBSERVER(WorkerServiceObserver,
-                    observers_,
-                    WorkerDestroyed(worker_process_id, worker_route_id));
+  for (size_t i = 0; i < remove_list.size(); ++i)
+    worker_hosts_.erase(remove_list[i]);
 }
 
 SharedWorkerHost* SharedWorkerServiceImpl::FindSharedWorkerHost(
     SharedWorkerMessageFilter* filter,
     int worker_route_id) {
   return worker_hosts_.get(std::make_pair(filter->render_process_id(),
                                           worker_route_id));
 }
 
-// static
 SharedWorkerHost* SharedWorkerServiceImpl::FindSharedWorkerHost(
-    const WorkerHostMap& hosts,
     const GURL& url,
     const base::string16& name,
     const WorkerStoragePartition& partition,
     ResourceContext* resource_context) {
-  for (WorkerHostMap::const_iterator iter = hosts.begin(); iter != hosts.end();
+  for (WorkerHostMap::const_iterator iter = worker_hosts_.begin();
+       iter != worker_hosts_.end();
        ++iter) {
     SharedWorkerInstance* instance = iter->second->instance();
     if (instance && !iter->second->closed() &&
         instance->Matches(url, name, partition, resource_context))
       return iter->second;
   }
   return NULL;
 }
 
 const std::set<int>
@@ skipping 34 matching lines @@
     update_worker_dependency_(added_items, removed_items);
   }
 }
 
 void SharedWorkerServiceImpl::ChangeUpdateWorkerDependencyFuncForTesting(
     UpdateWorkerDependencyFunc new_func) {
   update_worker_dependency_ = new_func;
 }
 
 }  // namespace content