DevTools: Never instantiate DevToolsAgentHost on threads other than UI

content/browser/devtools/devtools_http_handler_impl.cc

 // Copyright (c) 2012 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/devtools/devtools_http_handler_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 508 matching lines @@
       page_list.push_back(PageInfo(*it, GetLastSelectedTime(*it)));
 
     std::sort(page_list.begin(), page_list.end(), TimeComparator);
 
     base::ListValue* target_list = new base::ListValue();
     std::string host = info.headers["host"];
     for (PageList::iterator i = page_list.begin(); i != page_list.end(); ++i)
       target_list->Append(SerializePageInfo(i->first, host));
 
     AddRef();  // Balanced in SendTargetList.
-    BrowserThread::PostTaskAndReply(
+    BrowserThread::PostTaskAndReplyWithResult(
         BrowserThread::IO,
         FROM_HERE,
         base::Bind(&DevToolsHttpHandlerImpl::CollectWorkerInfo,
-                   base::Unretained(this),
-                   target_list,
-                   host),
+                   base::Unretained(this)),
         base::Bind(&DevToolsHttpHandlerImpl::SendTargetList,
                    base::Unretained(this),
                    connection_id,
+                   host,
                    target_list));
     return;
   }
 
   if (command == "new") {
     RenderViewHost* rvh = delegate_->CreateNewTarget();
     if (!rvh) {
       SendJson(connection_id,
                net::HTTP_INTERNAL_SERVER_ERROR,
                NULL,
@@ skipping 29 matching lines @@
       return;
     }
   }
   SendJson(connection_id,
            net::HTTP_NOT_FOUND,
            NULL,
            "Unknown command: " + command);
   return;
 }
 
-void DevToolsHttpHandlerImpl::CollectWorkerInfo(base::ListValue* target_list,
-                                                std::string host) {
+DevToolsHttpHandlerImpl::WorkerInfoList
+DevToolsHttpHandlerImpl::CollectWorkerInfo() {
+  return WorkerService::GetInstance()->GetWorkers();
+}
 
-  std::vector<WorkerService::WorkerInfo> worker_info =
-      WorkerService::GetInstance()->GetWorkers();
-
+void DevToolsHttpHandlerImpl::SendTargetList(
+    int connection_id,
+    const std::string& host,
+    base::ListValue* target_list,
+    const WorkerInfoList& worker_info) {
   for (size_t i = 0; i < worker_info.size(); ++i)
     target_list->Append(SerializeWorkerInfo(worker_info[i], host));
-}
-
-void DevToolsHttpHandlerImpl::SendTargetList(int connection_id,
-                                             base::ListValue* target_list) {
   SendJson(connection_id, net::HTTP_OK, target_list, std::string());
   delete target_list;
   Release();  // Balanced OnJsonRequestUI.
 }
 
 void DevToolsHttpHandlerImpl::OnThumbnailRequestUI(
     int connection_id, const GURL& page_url) {
   std::string data = delegate_->GetPageThumbnailData(page_url);
   if (!data.empty())
     Send200(connection_id, data, "image/png");
@@ skipping 250 matching lines @@
                                            host.c_str(),
                                            kPageUrlPrefix,
                                            id.c_str()));
   std::string devtools_frontend_url = GetFrontendURLInternal(
       id.c_str(),
       host);
   dictionary->SetString(kTargetDevtoolsFrontendUrlField, devtools_frontend_url);
 }
 
 }  // namespace content